Index: webrtc/base/virtualsocket_unittest.cc |
diff --git a/webrtc/base/virtualsocket_unittest.cc b/webrtc/base/virtualsocket_unittest.cc |
index e2f1d05f16f446fdaf4b95c36074978cff47606f..08cde7e136d93b436a5be310fd30951cf5d86ba6 100644 |
--- a/webrtc/base/virtualsocket_unittest.cc |
+++ b/webrtc/base/virtualsocket_unittest.cc |
@@ -146,6 +146,7 @@ class VirtualSocketServerTest : public testing::Test { |
public: |
VirtualSocketServerTest() |
: ss_(new VirtualSocketServer(nullptr)), |
+ thread_(ss_), |
kIPv4AnyAddress(IPAddress(INADDR_ANY), 0), |
kIPv6AnyAddress(IPAddress(in6addr_any), 0) {} |
@@ -822,12 +823,8 @@ class VirtualSocketServerTest : public testing::Test { |
} |
protected: |
- virtual void SetUp() { |
- Thread::Current()->set_socketserver(ss_); |
- } |
- virtual void TearDown() { Thread::Current()->set_socketserver(nullptr); } |
- |
VirtualSocketServer* ss_; |
+ AutoSocketServerThread thread_; |
const SocketAddress kIPv4AnyAddress; |
const SocketAddress kIPv6AnyAddress; |
}; |