| Index: net/spdy/spdy_test_util_common.cc
|
| diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc
|
| index 6a2879480215d37315b1cfd4f48546f911d3f846..f8ec58541a8450f680cc0ba66a251d20106eac21 100644
|
| --- a/net/spdy/spdy_test_util_common.cc
|
| +++ b/net/spdy/spdy_test_util_common.cc
|
| @@ -500,7 +500,7 @@ base::WeakPtr<SpdySession> CreateSpdySessionHelper(
|
|
|
| scoped_refptr<TransportSocketParams> transport_params(
|
| new TransportSocketParams(
|
| - key.host_port_pair(), false, false, OnHostResolutionCallback(),
|
| + key.host_port_pair(), false, OnHostResolutionCallback(),
|
| TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT));
|
|
|
| scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle);
|
| @@ -518,17 +518,14 @@ base::WeakPtr<SpdySession> CreateSpdySessionHelper(
|
| key.privacy_mode(),
|
| 0,
|
| false));
|
| - rv = connection->Init(key.host_port_pair().ToString(),
|
| - ssl_params,
|
| - MEDIUM,
|
| - callback.callback(),
|
| - http_session->GetSSLSocketPool(
|
| - HttpNetworkSession::NORMAL_SOCKET_POOL),
|
| - net_log);
|
| + rv = connection->Init(
|
| + key.host_port_pair().ToString(), ssl_params, MEDIUM,
|
| + ClientSocketPool::IgnoreLimits::DISABLED, callback.callback(),
|
| + http_session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL),
|
| + net_log);
|
| } else {
|
| - rv = connection->Init(key.host_port_pair().ToString(),
|
| - transport_params,
|
| - MEDIUM,
|
| + rv = connection->Init(key.host_port_pair().ToString(), transport_params,
|
| + MEDIUM, ClientSocketPool::IgnoreLimits::DISABLED,
|
| callback.callback(),
|
| http_session->GetTransportSocketPool(
|
| HttpNetworkSession::NORMAL_SOCKET_POOL),
|
|
|