Index: webrtc/p2p/base/udptransport_unittest.cc |
diff --git a/webrtc/p2p/base/udptransport_unittest.cc b/webrtc/p2p/base/udptransport_unittest.cc |
index 339fbbcc402d996a49d813ebe5bc96cd49c930a0..5c4f265a7ff01f7183941788fe18415b84ed7b44 100644 |
--- a/webrtc/p2p/base/udptransport_unittest.cc |
+++ b/webrtc/p2p/base/udptransport_unittest.cc |
@@ -35,11 +35,10 @@ static const rtc::IPAddress kIPv4LocalHostAddress = |
class UdpTransportTest : public testing::Test, public sigslot::has_slots<> { |
public: |
UdpTransportTest() |
- : network_thread_(rtc::Thread::Current()), |
- physical_socket_server_(new rtc::PhysicalSocketServer), |
+ : physical_socket_server_(new rtc::PhysicalSocketServer), |
virtual_socket_server_( |
new rtc::VirtualSocketServer(physical_socket_server_.get())), |
- ss_scope_(virtual_socket_server_.get()), |
+ network_thread_(virtual_socket_server_.get()), |
ep1_("Name1", |
std::unique_ptr<rtc::AsyncPacketSocket>( |
socket_factory_.CreateUdpSocket( |
@@ -121,10 +120,9 @@ class UdpTransportTest : public testing::Test, public sigslot::has_slots<> { |
uint32_t num_sig_ready_to_send_ = 0; // Increases on SignalReadyToSend. |
}; |
- rtc::Thread* network_thread_ = nullptr; |
std::unique_ptr<rtc::PhysicalSocketServer> physical_socket_server_; |
std::unique_ptr<rtc::VirtualSocketServer> virtual_socket_server_; |
- rtc::SocketServerScope ss_scope_; |
+ rtc::AutoSocketServerThread network_thread_; |
// Uses current thread's socket server, which will be set by ss_scope_. |
rtc::BasicPacketSocketFactory socket_factory_; |