diff --git a/p2p/base/p2p_transport_channel_unittest.cc b/p2p/base/p2p_transport_channel_unittest.cc
index 0b9e1baa0a..3ea9ca72ae 100644
--- a/p2p/base/p2p_transport_channel_unittest.cc
+++ b/p2p/base/p2p_transport_channel_unittest.cc
@@ -215,7 +215,7 @@ class P2PTransportChannelTestBase : public ::testing::Test,
         nss_(new rtc::NATSocketServer(vss_.get())),
         ss_(new rtc::FirewallSocketServer(nss_.get())),
         main_(ss_.get()),
-        stun_server_(TestStunServer::Create(&main_, kStunAddr)),
+        stun_server_(TestStunServer::Create(ss_.get(), kStunAddr)),
         turn_server_(&main_, kTurnUdpIntAddr, kTurnUdpExtAddr),
         socks_server1_(ss_.get(),
                        kSocksProxyAddrs[0],
diff --git a/p2p/base/port_unittest.cc b/p2p/base/port_unittest.cc
index 2cab407901..0bb378992b 100644
--- a/p2p/base/port_unittest.cc
+++ b/p2p/base/port_unittest.cc
@@ -400,7 +400,7 @@ class PortTest : public ::testing::Test, public sigslot::has_slots<> {
         nat_factory2_(ss_.get(), kNatAddr2, SocketAddress()),
         nat_socket_factory1_(&nat_factory1_),
         nat_socket_factory2_(&nat_factory2_),
-        stun_server_(TestStunServer::Create(&main_, kStunAddr)),
+        stun_server_(TestStunServer::Create(ss_.get(), kStunAddr)),
         turn_server_(&main_, kTurnUdpIntAddr, kTurnUdpExtAddr),
         username_(rtc::CreateRandomString(ICE_UFRAG_LENGTH)),
         password_(rtc::CreateRandomString(ICE_PWD_LENGTH)),
diff --git a/p2p/base/stun_port_unittest.cc b/p2p/base/stun_port_unittest.cc
index 2804ac03af..0c428f200e 100644
--- a/p2p/base/stun_port_unittest.cc
+++ b/p2p/base/stun_port_unittest.cc
@@ -49,10 +49,8 @@ class StunPortTestBase : public ::testing::Test, public sigslot::has_slots<> {
         thread_(ss_.get()),
         network_("unittest", "unittest", kLocalAddr.ipaddr(), 32),
         socket_factory_(rtc::Thread::Current()),
-        stun_server_1_(cricket::TestStunServer::Create(rtc::Thread::Current(),
-                                                       kStunAddr1)),
-        stun_server_2_(cricket::TestStunServer::Create(rtc::Thread::Current(),
-                                                       kStunAddr2)),
+        stun_server_1_(cricket::TestStunServer::Create(ss_.get(), kStunAddr1)),
+        stun_server_2_(cricket::TestStunServer::Create(ss_.get(), kStunAddr2)),
         done_(false),
         error_(false),
         stun_keepalive_delay_(1),
diff --git a/p2p/base/test_stun_server.cc b/p2p/base/test_stun_server.cc
index 9330a00075..54bdfb3793 100644
--- a/p2p/base/test_stun_server.cc
+++ b/p2p/base/test_stun_server.cc
@@ -15,10 +15,9 @@
 
 namespace cricket {
 
-TestStunServer* TestStunServer::Create(rtc::Thread* thread,
+TestStunServer* TestStunServer::Create(rtc::SocketServer* ss,
                                        const rtc::SocketAddress& addr) {
-  rtc::AsyncSocket* socket =
-      thread->socketserver()->CreateAsyncSocket(addr.family(), SOCK_DGRAM);
+  rtc::AsyncSocket* socket = ss->CreateAsyncSocket(addr.family(), SOCK_DGRAM);
   rtc::AsyncUDPSocket* udp_socket = rtc::AsyncUDPSocket::Create(socket, addr);
 
   return new TestStunServer(udp_socket);
diff --git a/p2p/base/test_stun_server.h b/p2p/base/test_stun_server.h
index e44e7dbcdd..11ac620bb8 100644
--- a/p2p/base/test_stun_server.h
+++ b/p2p/base/test_stun_server.h
@@ -15,14 +15,14 @@
 #include "p2p/base/stun_server.h"
 #include "rtc_base/async_udp_socket.h"
 #include "rtc_base/socket_address.h"
-#include "rtc_base/thread.h"
+#include "rtc_base/socket_server.h"
 
 namespace cricket {
 
 // A test STUN server. Useful for unit tests.
 class TestStunServer : StunServer {
  public:
-  static TestStunServer* Create(rtc::Thread* thread,
+  static TestStunServer* Create(rtc::SocketServer* ss,
                                 const rtc::SocketAddress& addr);
 
   // Set a fake STUN address to return to the client.
diff --git a/p2p/client/basic_port_allocator_unittest.cc b/p2p/client/basic_port_allocator_unittest.cc
index bdd12a0448..fa1f49c9b1 100644
--- a/p2p/client/basic_port_allocator_unittest.cc
+++ b/p2p/client/basic_port_allocator_unittest.cc
@@ -152,7 +152,7 @@ class BasicPortAllocatorTestBase : public ::testing::Test,
         // must be called.
         nat_factory_(vss_.get(), kNatUdpAddr, kNatTcpAddr),
         nat_socket_factory_(new rtc::BasicPacketSocketFactory(&nat_factory_)),
-        stun_server_(TestStunServer::Create(rtc::Thread::Current(), kStunAddr)),
+        stun_server_(TestStunServer::Create(fss_.get(), kStunAddr)),
         turn_server_(rtc::Thread::Current(), kTurnUdpIntAddr, kTurnUdpExtAddr),
         candidate_allocation_done_(false) {
     ServerAddresses stun_servers;
diff --git a/p2p/stunprober/stun_prober_unittest.cc b/p2p/stunprober/stun_prober_unittest.cc
index 91e2aac2a0..e098ec6f48 100644
--- a/p2p/stunprober/stun_prober_unittest.cc
+++ b/p2p/stunprober/stun_prober_unittest.cc
@@ -43,10 +43,8 @@ class StunProberTest : public ::testing::Test {
       : ss_(new rtc::VirtualSocketServer()),
         main_(ss_.get()),
         result_(StunProber::SUCCESS),
-        stun_server_1_(cricket::TestStunServer::Create(rtc::Thread::Current(),
-                                                       kStunAddr1)),
-        stun_server_2_(cricket::TestStunServer::Create(rtc::Thread::Current(),
-                                                       kStunAddr2)) {
+        stun_server_1_(cricket::TestStunServer::Create(ss_.get(), kStunAddr1)),
+        stun_server_2_(cricket::TestStunServer::Create(ss_.get(), kStunAddr2)) {
     stun_server_1_->set_fake_stun_addr(kStunMappedAddr);
     stun_server_2_->set_fake_stun_addr(kStunMappedAddr);
     rtc::InitializeSSL();
diff --git a/pc/peer_connection_integrationtest.cc b/pc/peer_connection_integrationtest.cc
index 53e0f6d7c9..88de3a434c 100644
--- a/pc/peer_connection_integrationtest.cc
+++ b/pc/peer_connection_integrationtest.cc
@@ -3986,7 +3986,7 @@ class PeerConnectionIntegrationIceStatesTest
 
   void StartStunServer(const SocketAddress& server_address) {
     stun_server_.reset(
-        cricket::TestStunServer::Create(network_thread(), server_address));
+        cricket::TestStunServer::Create(firewall(), server_address));
   }
 
   bool TestIPv6() {