Index: net/socket/tcp_socket_unittest.cc |
diff --git a/net/socket/tcp_socket_unittest.cc b/net/socket/tcp_socket_unittest.cc |
index 15f935516739d3716d9d146fbb0bdbf8cd9ca0ea..62a08e046cda0fc0f191094af662a5ec24214e7a 100644 |
--- a/net/socket/tcp_socket_unittest.cc |
+++ b/net/socket/tcp_socket_unittest.cc |
@@ -29,8 +29,7 @@ const int kListenBacklog = 5; |
class TCPSocketTest : public PlatformTest { |
protected: |
- TCPSocketTest() : socket_(NULL, NetLog::Source()) { |
- } |
+ TCPSocketTest() : socket_(NULL, NULL, NetLog::Source()) {} |
void SetUpListenIPv4() { |
ASSERT_EQ(OK, socket_.Open(ADDRESS_FAMILY_IPV4)); |
@@ -62,8 +61,8 @@ class TCPSocketTest : public PlatformTest { |
accept_callback.callback())); |
TestCompletionCallback connect_callback; |
- TCPClientSocket connecting_socket(local_address_list(), |
- NULL, NetLog::Source()); |
+ TCPClientSocket connecting_socket(local_address_list(), NULL, NULL, |
+ NetLog::Source()); |
connecting_socket.Connect(connect_callback.callback()); |
EXPECT_EQ(OK, connect_callback.WaitForResult()); |
@@ -90,8 +89,8 @@ TEST_F(TCPSocketTest, Accept) { |
TestCompletionCallback connect_callback; |
// TODO(yzshen): Switch to use TCPSocket when it supports client socket |
// operations. |
- TCPClientSocket connecting_socket(local_address_list(), |
- NULL, NetLog::Source()); |
+ TCPClientSocket connecting_socket(local_address_list(), NULL, NULL, |
+ NetLog::Source()); |
connecting_socket.Connect(connect_callback.callback()); |
TestCompletionCallback accept_callback; |
@@ -149,13 +148,13 @@ TEST_F(TCPSocketTest, Accept2Connections) { |
accept_callback.callback())); |
TestCompletionCallback connect_callback; |
- TCPClientSocket connecting_socket(local_address_list(), |
- NULL, NetLog::Source()); |
+ TCPClientSocket connecting_socket(local_address_list(), NULL, NULL, |
+ NetLog::Source()); |
connecting_socket.Connect(connect_callback.callback()); |
TestCompletionCallback connect_callback2; |
- TCPClientSocket connecting_socket2(local_address_list(), |
- NULL, NetLog::Source()); |
+ TCPClientSocket connecting_socket2(local_address_list(), NULL, NULL, |
+ NetLog::Source()); |
connecting_socket2.Connect(connect_callback2.callback()); |
EXPECT_EQ(OK, accept_callback.WaitForResult()); |
@@ -189,8 +188,8 @@ TEST_F(TCPSocketTest, AcceptIPv6) { |
return; |
TestCompletionCallback connect_callback; |
- TCPClientSocket connecting_socket(local_address_list(), |
- NULL, NetLog::Source()); |
+ TCPClientSocket connecting_socket(local_address_list(), NULL, NULL, |
+ NetLog::Source()); |
connecting_socket.Connect(connect_callback.callback()); |
TestCompletionCallback accept_callback; |
@@ -214,7 +213,7 @@ TEST_F(TCPSocketTest, ReadWrite) { |
ASSERT_NO_FATAL_FAILURE(SetUpListenIPv4()); |
TestCompletionCallback connect_callback; |
- TCPSocket connecting_socket(NULL, NetLog::Source()); |
+ TCPSocket connecting_socket(NULL, NULL, NetLog::Source()); |
int result = connecting_socket.Open(ADDRESS_FAMILY_IPV4); |
ASSERT_EQ(OK, result); |
connecting_socket.Connect(local_address_, connect_callback.callback()); |