Index: net/socket/socks_client_socket_pool_unittest.cc |
=================================================================== |
--- net/socket/socks_client_socket_pool_unittest.cc (revision 122403) |
+++ net/socket/socks_client_socket_pool_unittest.cc (working copy) |
@@ -97,7 +97,7 @@ |
TEST_F(SOCKSClientSocketPoolTest, Simple) { |
SOCKS5MockData data(false); |
- data.data_provider()->set_connect_data(MockConnect(false, 0)); |
+ data.data_provider()->set_connect_data(MockConnect(SYNCHRONOUS, OK)); |
transport_client_socket_factory_.AddSocketDataProvider(data.data_provider()); |
ClientSocketHandle handle; |
@@ -127,7 +127,8 @@ |
TEST_F(SOCKSClientSocketPoolTest, TransportConnectError) { |
scoped_ptr<SocketDataProvider> socket_data(new StaticSocketDataProvider()); |
- socket_data->set_connect_data(MockConnect(false, ERR_CONNECTION_REFUSED)); |
+ socket_data->set_connect_data(MockConnect(SYNCHRONOUS, |
+ ERR_CONNECTION_REFUSED)); |
transport_client_socket_factory_.AddSocketDataProvider(socket_data.get()); |
ClientSocketHandle handle; |
@@ -140,7 +141,7 @@ |
TEST_F(SOCKSClientSocketPoolTest, AsyncTransportConnectError) { |
scoped_ptr<SocketDataProvider> socket_data(new StaticSocketDataProvider()); |
- socket_data->set_connect_data(MockConnect(true, ERR_CONNECTION_REFUSED)); |
+ socket_data->set_connect_data(MockConnect(ASYNC, ERR_CONNECTION_REFUSED)); |
transport_client_socket_factory_.AddSocketDataProvider(socket_data.get()); |
TestCompletionCallback callback; |
@@ -162,7 +163,7 @@ |
}; |
scoped_ptr<SocketDataProvider> socket_data(new StaticSocketDataProvider( |
failed_read, arraysize(failed_read), NULL, 0)); |
- socket_data->set_connect_data(MockConnect(false, 0)); |
+ socket_data->set_connect_data(MockConnect(SYNCHRONOUS, OK)); |
transport_client_socket_factory_.AddSocketDataProvider(socket_data.get()); |
ClientSocketHandle handle; |
@@ -181,7 +182,7 @@ |
}; |
scoped_ptr<SocketDataProvider> socket_data(new StaticSocketDataProvider( |
failed_read, arraysize(failed_read), NULL, 0)); |
- socket_data->set_connect_data(MockConnect(false, 0)); |
+ socket_data->set_connect_data(MockConnect(SYNCHRONOUS, OK)); |
transport_client_socket_factory_.AddSocketDataProvider(socket_data.get()); |
TestCompletionCallback callback; |
@@ -233,12 +234,12 @@ |
TEST_F(SOCKSClientSocketPoolTest, CancelDuringSOCKSConnect) { |
SOCKS5MockData data(true); |
- data.data_provider()->set_connect_data(MockConnect(false, 0)); |
+ data.data_provider()->set_connect_data(MockConnect(SYNCHRONOUS, OK)); |
transport_client_socket_factory_.AddSocketDataProvider(data.data_provider()); |
// We need two connections because the pool base lets one cancelled |
// connect job proceed for potential future use. |
SOCKS5MockData data2(true); |
- data2.data_provider()->set_connect_data(MockConnect(false, 0)); |
+ data2.data_provider()->set_connect_data(MockConnect(SYNCHRONOUS, OK)); |
transport_client_socket_factory_.AddSocketDataProvider(data2.data_provider()); |
EXPECT_EQ(0, transport_socket_pool_.cancel_count()); |