Index: webrtc/p2p/stunprober/stunprober_unittest.cc |
diff --git a/webrtc/p2p/stunprober/stunprober_unittest.cc b/webrtc/p2p/stunprober/stunprober_unittest.cc |
index e194e4f3ae76898f2d51a90a35fb7c7a790bb936..5b9158122b1d945dacfa5efad19c053c2a4e83e4 100644 |
--- a/webrtc/p2p/stunprober/stunprober_unittest.cc |
+++ b/webrtc/p2p/stunprober/stunprober_unittest.cc |
@@ -41,10 +41,9 @@ const rtc::SocketAddress kStunMappedAddr("77.77.77.77", 0); |
class StunProberTest : public testing::Test { |
public: |
StunProberTest() |
- : main_(rtc::Thread::Current()), |
- pss_(new rtc::PhysicalSocketServer), |
+ : pss_(new rtc::PhysicalSocketServer), |
ss_(new rtc::VirtualSocketServer(pss_.get())), |
- ss_scope_(ss_.get()), |
+ main_(ss_.get()), |
result_(StunProber::SUCCESS), |
stun_server_1_(cricket::TestStunServer::Create(rtc::Thread::Current(), |
kStunAddr1)), |
@@ -120,10 +119,9 @@ class StunProberTest : public testing::Test { |
stopped_ = true; |
} |
- rtc::Thread* main_; |
std::unique_ptr<rtc::PhysicalSocketServer> pss_; |
std::unique_ptr<rtc::VirtualSocketServer> ss_; |
- rtc::SocketServerScope ss_scope_; |
+ rtc::AutoSocketServerThread main_; |
std::unique_ptr<StunProber> prober; |
int result_ = 0; |
bool stopped_ = false; |