Index: webrtc/base/win32socketserver_unittest.cc |
diff --git a/webrtc/base/win32socketserver_unittest.cc b/webrtc/base/win32socketserver_unittest.cc |
index 94d96da4289bb44fedd0ce3459b049fc6e600e1c..7211cd7f7fef9176d134820a13311da40be85914 100644 |
--- a/webrtc/base/win32socketserver_unittest.cc |
+++ b/webrtc/base/win32socketserver_unittest.cc |
@@ -16,7 +16,7 @@ namespace rtc { |
// Test that Win32SocketServer::Wait works as expected. |
TEST(Win32SocketServerTest, TestWait) { |
- Win32SocketServer server(nullptr); |
+ Win32SocketServer server; |
uint32_t start = Time(); |
server.Wait(1000, true); |
EXPECT_GE(TimeSince(start), 1000); |
@@ -24,8 +24,8 @@ TEST(Win32SocketServerTest, TestWait) { |
// Test that Win32Socket::Pump does not touch general Windows messages. |
TEST(Win32SocketServerTest, TestPump) { |
- Win32SocketServer server(nullptr); |
- SocketServerScope scope(&server); |
+ Win32SocketServer server; |
+ rtc::AutoSocketServerThread thread(&server); |
EXPECT_EQ(TRUE, PostMessage(nullptr, WM_USER, 999, 0)); |
server.Pump(); |
MSG msg; |
@@ -37,9 +37,9 @@ TEST(Win32SocketServerTest, TestPump) { |
// Test that Win32Socket passes all the generic Socket tests. |
class Win32SocketTest : public SocketTest { |
protected: |
- Win32SocketTest() : server_(nullptr), scope_(&server_) {} |
+ Win32SocketTest() : thread_(&server_) {} |
Win32SocketServer server_; |
- SocketServerScope scope_; |
+ rtc::AutoSocketServerThread thread_; |
}; |
TEST_F(Win32SocketTest, TestConnectIPv4) { |