| Index: net/socket/transport_client_socket_pool_unittest.cc
|
| diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc
|
| index 1cc015a1fa1b4842f5fcc1d1b6568353e24e057f..94f594059c7b73d4e96ac5ac990675de82607572 100644
|
| --- a/net/socket/transport_client_socket_pool_unittest.cc
|
| +++ b/net/socket/transport_client_socket_pool_unittest.cc
|
| @@ -41,8 +41,10 @@ class TransportClientSocketPoolTest : public testing::Test {
|
| ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(true)),
|
| params_(
|
| new TransportSocketParams(HostPortPair("www.google.com", 80),
|
| - false, false,
|
| - OnHostResolutionCallback())),
|
| + false,
|
| + false,
|
| + OnHostResolutionCallback(),
|
| + AUTO_CONNECT_USE_DEFAULT)),
|
| histograms_(new ClientSocketPoolHistograms("TCPUnitTest")),
|
| host_resolver_(new MockHostResolver),
|
| client_socket_factory_(&net_log_),
|
| @@ -62,7 +64,7 @@ class TransportClientSocketPoolTest : public testing::Test {
|
| int StartRequest(const std::string& group_name, RequestPriority priority) {
|
| scoped_refptr<TransportSocketParams> params(new TransportSocketParams(
|
| HostPortPair("www.google.com", 80), false, false,
|
| - OnHostResolutionCallback()));
|
| + OnHostResolutionCallback(), AUTO_CONNECT_USE_DEFAULT));
|
| return test_base_.StartRequestUsingPool(
|
| &pool_, group_name, priority, params);
|
| }
|
| @@ -201,8 +203,8 @@ TEST_F(TransportClientSocketPoolTest, InitHostResolutionFailure) {
|
| ClientSocketHandle handle;
|
| HostPortPair host_port_pair("unresolvable.host.name", 80);
|
| scoped_refptr<TransportSocketParams> dest(new TransportSocketParams(
|
| - host_port_pair, false, false,
|
| - OnHostResolutionCallback()));
|
| + host_port_pair, false, false, OnHostResolutionCallback(),
|
| + AUTO_CONNECT_USE_DEFAULT));
|
| EXPECT_EQ(ERR_IO_PENDING,
|
| handle.Init("a", dest, kDefaultPriority, callback.callback(),
|
| &pool_, BoundNetLog()));
|
| @@ -477,7 +479,7 @@ class RequestSocketCallback : public TestCompletionCallbackBase {
|
| within_callback_ = true;
|
| scoped_refptr<TransportSocketParams> dest(new TransportSocketParams(
|
| HostPortPair("www.google.com", 80), false, false,
|
| - OnHostResolutionCallback()));
|
| + OnHostResolutionCallback(), AUTO_CONNECT_USE_DEFAULT));
|
| int rv = handle_->Init("a", dest, LOWEST, callback(), pool_,
|
| BoundNetLog());
|
| EXPECT_EQ(OK, rv);
|
| @@ -497,7 +499,7 @@ TEST_F(TransportClientSocketPoolTest, RequestTwice) {
|
| RequestSocketCallback callback(&handle, &pool_);
|
| scoped_refptr<TransportSocketParams> dest(new TransportSocketParams(
|
| HostPortPair("www.google.com", 80), false, false,
|
| - OnHostResolutionCallback()));
|
| + OnHostResolutionCallback(), AUTO_CONNECT_USE_DEFAULT));
|
| int rv = handle.Init("a", dest, LOWEST, callback.callback(), &pool_,
|
| BoundNetLog());
|
| ASSERT_EQ(ERR_IO_PENDING, rv);
|
|
|