Use ClientSocketPool::SocketParams everywhere.
A lot of places were using TransportClientSocketPool::SocketParams to
refer to the class.
Bug: 944095
Change-Id: I4d5638e43a46ced2a3ef1f293b616b2b549fa69e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1532913
Commit-Queue: Matt Menke <[email protected]>
Reviewed-by: Asanka Herath <[email protected]>
Cr-Commit-Position: refs/heads/master@{#644611}diff --git a/net/http/http_stream_factory_unittest.cc b/net/http/http_stream_factory_unittest.cc
index c851126..3d9138e 100644
--- a/net/http/http_stream_factory_unittest.cc
+++ b/net/http/http_stream_factory_unittest.cc
@@ -2012,8 +2012,7 @@
false /* privacy_mode */);
int rv = connection->Init(
group_id,
- TransportClientSocketPool::SocketParams::CreateFromSSLSocketParams(
- ssl_params),
+ ClientSocketPool::SocketParams::CreateFromSSLSocketParams(ssl_params),
MEDIUM, SocketTag(), ClientSocketPool::RespectLimits::ENABLED,
callback.callback(), ClientSocketPool::ProxyAuthCallback(),
session->GetSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL,
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index 0629fa6..98b52d8 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -76,13 +76,12 @@
privacy_mode);
}
-// Returns a TransportClientSocketPool::SocketParams that will never be used to
+// Returns a ClientSocketPool::SocketParams that will never be used to
// create a real TreansportConnectJob.
-scoped_refptr<TransportClientSocketPool::SocketParams> CreateDummyParams() {
- return TransportClientSocketPool::SocketParams::
- CreateFromTransportSocketParams(
- base::MakeRefCounted<TransportSocketParams>(
- HostPortPair("ignored", 80), OnHostResolutionCallback()));
+scoped_refptr<ClientSocketPool::SocketParams> CreateDummyParams() {
+ return ClientSocketPool::SocketParams::CreateFromTransportSocketParams(
+ base::MakeRefCounted<TransportSocketParams>(HostPortPair("ignored", 80),
+ OnHostResolutionCallback()));
}
// Make sure |handle| sets load times correctly when it has been assigned a
@@ -705,7 +704,7 @@
MockClientSocketFactory client_socket_factory_;
TestConnectJobFactory* connect_job_factory_;
// These parameters are never actually used to create a TransportConnectJob.
- scoped_refptr<TransportClientSocketPool::SocketParams> params_;
+ scoped_refptr<ClientSocketPool::SocketParams> params_;
std::unique_ptr<TransportClientSocketPool> pool_;
ClientSocketPoolTest test_base_;
};
@@ -2766,7 +2765,7 @@
public:
ConnectWithinCallback(
const ClientSocketPool::GroupId& group_id,
- const scoped_refptr<TransportClientSocketPool::SocketParams>& params,
+ const scoped_refptr<ClientSocketPool::SocketParams>& params,
TransportClientSocketPool* pool)
: group_id_(group_id), params_(params), pool_(pool) {}
@@ -2793,7 +2792,7 @@
}
const ClientSocketPool::GroupId group_id_;
- const scoped_refptr<TransportClientSocketPool::SocketParams> params_;
+ const scoped_refptr<ClientSocketPool::SocketParams> params_;
TransportClientSocketPool* const pool_;
ClientSocketHandle handle_;
TestCompletionCallback nested_callback_;
@@ -4875,7 +4874,7 @@
~TestAuthHelper() = default;
void InitHandle(
- scoped_refptr<TransportClientSocketPool::SocketParams> params,
+ scoped_refptr<ClientSocketPool::SocketParams> params,
TransportClientSocketPool* pool,
RequestPriority priority = DEFAULT_PRIORITY,
ClientSocketPool::RespectLimits respect_limits =
diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc
index 8f7efd2..497ce14 100644
--- a/net/socket/transport_client_socket_pool_unittest.cc
+++ b/net/socket/transport_client_socket_pool_unittest.cc
@@ -107,11 +107,10 @@
group_id_(HostPortPair("www.google.com", 80),
ClientSocketPool::SocketType::kHttp,
false /* privacy_mode */),
- params_(TransportClientSocketPool::SocketParams::
- CreateFromTransportSocketParams(
- base::MakeRefCounted<TransportSocketParams>(
- HostPortPair("www.google.com", 80),
- OnHostResolutionCallback()))),
+ params_(ClientSocketPool::SocketParams::CreateFromTransportSocketParams(
+ base::MakeRefCounted<TransportSocketParams>(
+ HostPortPair("www.google.com", 80),
+ OnHostResolutionCallback()))),
client_socket_factory_(&net_log_) {
std::unique_ptr<MockCertVerifier> cert_verifier =
std::make_unique<MockCertVerifier>();
@@ -159,11 +158,10 @@
ClientSocketPool::GroupId group_id(HostPortPair(host_name, 80),
ClientSocketPool::SocketType::kHttp,
false /* privacy_mode */);
- scoped_refptr<TransportClientSocketPool::SocketParams> params(
- TransportClientSocketPool::SocketParams::
- CreateFromTransportSocketParams(
- base::MakeRefCounted<TransportSocketParams>(
- group_id.destination(), OnHostResolutionCallback())));
+ scoped_refptr<ClientSocketPool::SocketParams> params(
+ ClientSocketPool::SocketParams::CreateFromTransportSocketParams(
+ base::MakeRefCounted<TransportSocketParams>(
+ group_id.destination(), OnHostResolutionCallback())));
return test_base_.StartRequestUsingPool(
pool_.get(), group_id, priority,
ClientSocketPool::RespectLimits::ENABLED, params);
@@ -197,7 +195,7 @@
// |group_id_| and |params_| correspond to the same group.
const ClientSocketPool::GroupId group_id_;
- scoped_refptr<TransportClientSocketPool::SocketParams> params_;
+ scoped_refptr<ClientSocketPool::SocketParams> params_;
MockTransportClientSocketFactory client_socket_factory_;
MockTaggingClientSocketFactory tagging_client_socket_factory_;
@@ -822,7 +820,7 @@
public:
RequestSocketCallback(
const ClientSocketPool::GroupId& group_id,
- scoped_refptr<TransportClientSocketPool::SocketParams> socket_params,
+ scoped_refptr<ClientSocketPool::SocketParams> socket_params,
ClientSocketHandle* handle,
TransportClientSocketPool* pool)
: group_id_(group_id),
@@ -859,7 +857,7 @@
}
const ClientSocketPool::GroupId group_id_;
- scoped_refptr<TransportClientSocketPool::SocketParams> socket_params_;
+ scoped_refptr<ClientSocketPool::SocketParams> socket_params_;
ClientSocketHandle* const handle_;
TransportClientSocketPool* const pool_;
bool within_callback_;
@@ -870,8 +868,8 @@
TEST_F(TransportClientSocketPoolTest, RequestTwice) {
ClientSocketHandle handle;
RequestSocketCallback callback(group_id_, params_, &handle, pool_.get());
- scoped_refptr<TransportClientSocketPool::SocketParams> dest(
- TransportClientSocketPool::SocketParams::CreateFromTransportSocketParams(
+ scoped_refptr<ClientSocketPool::SocketParams> dest(
+ ClientSocketPool::SocketParams::CreateFromTransportSocketParams(
base::MakeRefCounted<TransportSocketParams>(
HostPortPair("www.google.com", 80), OnHostResolutionCallback())));
int rv = handle.Init(
@@ -1020,9 +1018,8 @@
ClientSocketPool::GroupId(kHostPortPair,
ClientSocketPool::SocketType::kSsl,
false /* privacy_mode */),
- TransportClientSocketPool::SocketParams::CreateFromSSLSocketParams(
- params),
- MEDIUM, SocketTag(), ClientSocketPool::RespectLimits::ENABLED,
+ ClientSocketPool::SocketParams::CreateFromSSLSocketParams(params), MEDIUM,
+ SocketTag(), ClientSocketPool::RespectLimits::ENABLED,
callback.callback(), ClientSocketPool::ProxyAuthCallback(),
tagging_pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
@@ -1275,8 +1272,8 @@
scoped_refptr<TransportSocketParams> tcp_params =
base::MakeRefCounted<TransportSocketParams>(HostPortPair("proxy", 80),
OnHostResolutionCallback());
- scoped_refptr<TransportClientSocketPool::SocketParams> socks_params(
- TransportClientSocketPool::SocketParams::CreateFromSOCKSSocketParams(
+ scoped_refptr<ClientSocketPool::SocketParams> socks_params(
+ ClientSocketPool::SocketParams::CreateFromSOCKSSocketParams(
base::MakeRefCounted<SOCKSSocketParams>(
tcp_params, true /* socks_v5 */, kDesination,
TRAFFIC_ANNOTATION_FOR_TESTS)));
@@ -1368,8 +1365,8 @@
nullptr /* direct_params */, nullptr /* socks_proxy_params */,
http_proxy_params, kEndpoint, GetSSLConfig(), PRIVACY_MODE_DISABLED);
- scoped_refptr<TransportClientSocketPool::SocketParams> pool_params =
- TransportClientSocketPool::SocketParams::CreateFromSSLSocketParams(
+ scoped_refptr<ClientSocketPool::SocketParams> pool_params =
+ ClientSocketPool::SocketParams::CreateFromSSLSocketParams(
endpoint_ssl_params);
ClientSocketPool::GroupId group_id(
@@ -1485,8 +1482,8 @@
nullptr /* direct_params */, nullptr /* socks_proxy_params */,
http_proxy_params, kEndpoint, GetSSLConfig(), PRIVACY_MODE_DISABLED);
- scoped_refptr<TransportClientSocketPool::SocketParams> pool_params =
- TransportClientSocketPool::SocketParams::CreateFromSSLSocketParams(
+ scoped_refptr<ClientSocketPool::SocketParams> pool_params =
+ ClientSocketPool::SocketParams::CreateFromSSLSocketParams(
endpoint_ssl_params);
ClientSocketPool::GroupId group_id(
@@ -1593,8 +1590,8 @@
// Whether the proxy is HTTPS or not, always connecting to an HTTPS site
// through it.
- scoped_refptr<TransportClientSocketPool::SocketParams> pool_params =
- TransportClientSocketPool::SocketParams::CreateFromSSLSocketParams(
+ scoped_refptr<ClientSocketPool::SocketParams> pool_params =
+ ClientSocketPool::SocketParams::CreateFromSSLSocketParams(
endpoint_ssl_params);
int rv = handle.Init(
@@ -1666,8 +1663,8 @@
const ClientSocketPool::GroupId kGroupId(test_server.host_port_pair(),
ClientSocketPool::SocketType::kSsl,
false /* privacy_mode */);
- scoped_refptr<TransportClientSocketPool::SocketParams> params =
- TransportClientSocketPool::SocketParams::CreateFromTransportSocketParams(
+ scoped_refptr<ClientSocketPool::SocketParams> params =
+ ClientSocketPool::SocketParams::CreateFromTransportSocketParams(
base::MakeRefCounted<TransportSocketParams>(
test_server.host_port_pair(), OnHostResolutionCallback()));
TestCompletionCallback callback;
@@ -1789,8 +1786,8 @@
scoped_refptr<TransportSocketParams> tcp_params =
base::MakeRefCounted<TransportSocketParams>(HostPortPair("proxy", 80),
OnHostResolutionCallback());
- scoped_refptr<TransportClientSocketPool::SocketParams> socks_params(
- TransportClientSocketPool::SocketParams::CreateFromSOCKSSocketParams(
+ scoped_refptr<ClientSocketPool::SocketParams> socks_params(
+ ClientSocketPool::SocketParams::CreateFromSOCKSSocketParams(
base::MakeRefCounted<SOCKSSocketParams>(
tcp_params, true /* socks_v5 */, kDestination,
TRAFFIC_ANNOTATION_FOR_TESTS)));
@@ -1903,9 +1900,8 @@
uint64_t old_traffic = GetTaggedBytes(tag_val1);
int rv = handle.Init(
kGroupId,
- TransportClientSocketPool::SocketParams::CreateFromSSLSocketParams(
- params),
- LOW, tag1, ClientSocketPool::RespectLimits::ENABLED, callback.callback(),
+ ClientSocketPool::SocketParams::CreateFromSSLSocketParams(params), LOW,
+ tag1, ClientSocketPool::RespectLimits::ENABLED, callback.callback(),
ClientSocketPool::ProxyAuthCallback(), pool_for_real_sockets_.get(),
NetLogWithSource());
EXPECT_THAT(callback.GetResult(rv), IsOk());
@@ -1920,9 +1916,8 @@
TestCompletionCallback callback2;
rv = handle.Init(
kGroupId,
- TransportClientSocketPool::SocketParams::CreateFromSSLSocketParams(
- params),
- LOW, tag2, ClientSocketPool::RespectLimits::ENABLED, callback2.callback(),
+ ClientSocketPool::SocketParams::CreateFromSSLSocketParams(params), LOW,
+ tag2, ClientSocketPool::RespectLimits::ENABLED, callback2.callback(),
ClientSocketPool::ProxyAuthCallback(), pool_for_real_sockets_.get(),
NetLogWithSource());
EXPECT_THAT(rv, IsOk());
@@ -1979,9 +1974,8 @@
TestCompletionCallback callback;
int rv = handle.Init(
kGroupId,
- TransportClientSocketPool::SocketParams::CreateFromSSLSocketParams(
- params),
- LOW, tag1, ClientSocketPool::RespectLimits::ENABLED, callback.callback(),
+ ClientSocketPool::SocketParams::CreateFromSSLSocketParams(params), LOW,
+ tag1, ClientSocketPool::RespectLimits::ENABLED, callback.callback(),
ClientSocketPool::ProxyAuthCallback(), pool_for_real_sockets_.get(),
NetLogWithSource());
EXPECT_TRUE(rv == OK || rv == ERR_IO_PENDING) << "Result: " << rv;
@@ -1990,9 +1984,8 @@
TestCompletionCallback callback2;
rv = handle.Init(
kGroupId,
- TransportClientSocketPool::SocketParams::CreateFromSSLSocketParams(
- params),
- LOW, tag2, ClientSocketPool::RespectLimits::ENABLED, callback2.callback(),
+ ClientSocketPool::SocketParams::CreateFromSSLSocketParams(params), LOW,
+ tag2, ClientSocketPool::RespectLimits::ENABLED, callback2.callback(),
ClientSocketPool::ProxyAuthCallback(), pool_for_real_sockets_.get(),
NetLogWithSource());
EXPECT_THAT(callback2.GetResult(rv), IsOk());
@@ -2049,13 +2042,13 @@
ClientSocketHandle tcp_handles[kMaxSocketsPerGroup];
int rv;
for (auto& tcp_handle : tcp_handles) {
- rv = tcp_handle.Init(kGroupId,
- TransportClientSocketPool::SocketParams::
- CreateFromTransportSocketParams(tcp_params),
- LOW, tag1, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(),
- ClientSocketPool::ProxyAuthCallback(),
- pool_for_real_sockets_.get(), NetLogWithSource());
+ rv = tcp_handle.Init(
+ kGroupId,
+ ClientSocketPool::SocketParams::CreateFromTransportSocketParams(
+ tcp_params),
+ LOW, tag1, ClientSocketPool::RespectLimits::ENABLED,
+ callback.callback(), ClientSocketPool::ProxyAuthCallback(),
+ pool_for_real_sockets_.get(), NetLogWithSource());
EXPECT_THAT(callback.GetResult(rv), IsOk());
EXPECT_TRUE(tcp_handle.socket());
EXPECT_TRUE(tcp_handle.socket()->IsConnected());
@@ -2064,17 +2057,15 @@
ClientSocketHandle handle_to_be_canceled;
rv = handle_to_be_canceled.Init(
kGroupId,
- TransportClientSocketPool::SocketParams::CreateFromSSLSocketParams(
- params),
- LOW, tag1, ClientSocketPool::RespectLimits::ENABLED, callback.callback(),
+ ClientSocketPool::SocketParams::CreateFromSSLSocketParams(params), LOW,
+ tag1, ClientSocketPool::RespectLimits::ENABLED, callback.callback(),
ClientSocketPool::ProxyAuthCallback(), pool_for_real_sockets_.get(),
NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
rv = handle.Init(
kGroupId,
- TransportClientSocketPool::SocketParams::CreateFromSSLSocketParams(
- params),
- LOW, tag2, ClientSocketPool::RespectLimits::ENABLED, callback.callback(),
+ ClientSocketPool::SocketParams::CreateFromSSLSocketParams(params), LOW,
+ tag2, ClientSocketPool::RespectLimits::ENABLED, callback.callback(),
ClientSocketPool::ProxyAuthCallback(), pool_for_real_sockets_.get(),
NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
@@ -2117,8 +2108,8 @@
const ClientSocketPool::GroupId kGroupId(kDestination,
ClientSocketPool::SocketType::kSsl,
false /* privacy_mode */);
- scoped_refptr<TransportClientSocketPool::SocketParams> params =
- TransportClientSocketPool::SocketParams::CreateFromHttpProxySocketParams(
+ scoped_refptr<ClientSocketPool::SocketParams> params =
+ ClientSocketPool::SocketParams::CreateFromHttpProxySocketParams(
base::MakeRefCounted<HttpProxySocketParams>(
base::MakeRefCounted<TransportSocketParams>(
HostPortPair("http.proxy.host", 80),
@@ -2186,8 +2177,8 @@
const ClientSocketPool::GroupId kGroupId(kDestination,
ClientSocketPool::SocketType::kSsl,
false /* privacy_mode */);
- scoped_refptr<TransportClientSocketPool::SocketParams> params =
- TransportClientSocketPool::SocketParams::CreateFromHttpProxySocketParams(
+ scoped_refptr<ClientSocketPool::SocketParams> params =
+ ClientSocketPool::SocketParams::CreateFromHttpProxySocketParams(
base::MakeRefCounted<HttpProxySocketParams>(
base::MakeRefCounted<TransportSocketParams>(
HostPortPair("http.proxy.host", 80),
@@ -2314,8 +2305,8 @@
ClientSocketPool::GroupId(kHostPortPair1,
ClientSocketPool::SocketType::kHttp,
false /* privacy_mode */),
- TransportClientSocketPool::SocketParams::
- CreateFromTransportSocketParams(transport_params),
+ ClientSocketPool::SocketParams::CreateFromTransportSocketParams(
+ transport_params),
MEDIUM, SocketTag(), ClientSocketPool::RespectLimits::ENABLED,
callback.callback(), ClientSocketPool::ProxyAuthCallback(),
session->GetSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL,
@@ -2361,8 +2352,8 @@
ClientSocketPool::GroupId(kHostPortPair2,
ClientSocketPool::SocketType::kHttp,
false /* privacy_mode */),
- TransportClientSocketPool::SocketParams::
- CreateFromTransportSocketParams(transport_params),
+ ClientSocketPool::SocketParams::CreateFromTransportSocketParams(
+ transport_params),
MEDIUM, SocketTag(), ClientSocketPool::RespectLimits::ENABLED,
callback.callback(), ClientSocketPool::ProxyAuthCallback(),
session->GetSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL,
diff --git a/net/socket/websocket_transport_client_socket_pool_unittest.cc b/net/socket/websocket_transport_client_socket_pool_unittest.cc
index 43965af..88e6c5b 100644
--- a/net/socket/websocket_transport_client_socket_pool_unittest.cc
+++ b/net/socket/websocket_transport_client_socket_pool_unittest.cc
@@ -66,11 +66,10 @@
: group_id_(HostPortPair("www.google.com", 80),
ClientSocketPool::SocketType::kHttp,
false /* privacy_mode */),
- params_(TransportClientSocketPool::SocketParams::
- CreateFromTransportSocketParams(
- base::MakeRefCounted<TransportSocketParams>(
- HostPortPair("www.google.com", 80),
- OnHostResolutionCallback()))),
+ params_(ClientSocketPool::SocketParams::CreateFromTransportSocketParams(
+ base::MakeRefCounted<TransportSocketParams>(
+ HostPortPair("www.google.com", 80),
+ OnHostResolutionCallback()))),
host_resolver_(new MockHostResolver),
client_socket_factory_(&net_log_),
common_connect_job_params_(
@@ -136,7 +135,7 @@
TestNetLog net_log_;
// |group_id_| and |params_| correspond to the same socket parameters.
const ClientSocketPool::GroupId group_id_;
- scoped_refptr<TransportClientSocketPool::SocketParams> params_;
+ scoped_refptr<ClientSocketPool::SocketParams> params_;
std::unique_ptr<MockHostResolver> host_resolver_;
MockTransportClientSocketFactory client_socket_factory_;
WebSocketEndpointLockManager websocket_endpoint_lock_manager_;
@@ -187,8 +186,8 @@
TestCompletionCallback callback;
ClientSocketHandle handle;
HostPortPair host_port_pair("unresolvable.host.name", 80);
- scoped_refptr<TransportClientSocketPool::SocketParams> dest(
- TransportClientSocketPool::SocketParams::CreateFromTransportSocketParams(
+ scoped_refptr<ClientSocketPool::SocketParams> dest(
+ ClientSocketPool::SocketParams::CreateFromTransportSocketParams(
base::MakeRefCounted<TransportSocketParams>(
host_port_pair, OnHostResolutionCallback())));
EXPECT_EQ(
@@ -418,8 +417,8 @@
handle->socket()->Disconnect();
handle->Reset();
- scoped_refptr<TransportClientSocketPool::SocketParams> dest(
- TransportClientSocketPool::SocketParams::CreateFromTransportSocketParams(
+ scoped_refptr<ClientSocketPool::SocketParams> dest(
+ ClientSocketPool::SocketParams::CreateFromTransportSocketParams(
base::MakeRefCounted<TransportSocketParams>(
HostPortPair("www.google.com", 80), OnHostResolutionCallback())));
int rv = handle->Init(
@@ -436,8 +435,8 @@
// ClientSocketHandle for the second socket, after disconnecting the first.
TEST_F(WebSocketTransportClientSocketPoolTest, RequestTwice) {
ClientSocketHandle handle;
- scoped_refptr<TransportClientSocketPool::SocketParams> dest(
- TransportClientSocketPool::SocketParams::CreateFromTransportSocketParams(
+ scoped_refptr<ClientSocketPool::SocketParams> dest(
+ ClientSocketPool::SocketParams::CreateFromTransportSocketParams(
base::MakeRefCounted<TransportSocketParams>(
HostPortPair("www.google.com", 80), OnHostResolutionCallback())));
TestCompletionCallback second_result_callback;
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
index 0c99187..f5b2fdc 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -3556,8 +3556,8 @@
ClientSocketPool::GroupId(host_port2,
ClientSocketPool::SocketType::kHttp,
false /* privacy_mode */),
- TransportClientSocketPool::SocketParams::
- CreateFromTransportSocketParams(params2),
+ ClientSocketPool::SocketParams::CreateFromTransportSocketParams(
+ params2),
DEFAULT_PRIORITY, SocketTag(),
ClientSocketPool::RespectLimits::ENABLED, callback2.callback(),
ClientSocketPool::ProxyAuthCallback(), pool, NetLogWithSource()));
@@ -3641,8 +3641,8 @@
ClientSocketPool::GroupId(host_port3,
ClientSocketPool::SocketType::kHttp,
false /* privacy_mode */),
- TransportClientSocketPool::SocketParams::
- CreateFromTransportSocketParams(params3),
+ ClientSocketPool::SocketParams::CreateFromTransportSocketParams(
+ params3),
DEFAULT_PRIORITY, SocketTag(),
ClientSocketPool::RespectLimits::ENABLED, callback3.callback(),
ClientSocketPool::ProxyAuthCallback(), pool, NetLogWithSource()));
@@ -3724,8 +3724,8 @@
ClientSocketPool::GroupId(host_port2,
ClientSocketPool::SocketType::kHttp,
false /* privacy_mode */),
- TransportClientSocketPool::SocketParams::
- CreateFromTransportSocketParams(params2),
+ ClientSocketPool::SocketParams::CreateFromTransportSocketParams(
+ params2),
DEFAULT_PRIORITY, SocketTag(),
ClientSocketPool::RespectLimits::ENABLED, callback2.callback(),
ClientSocketPool::ProxyAuthCallback(), pool, NetLogWithSource()));
diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc
index 735a252..0a2d5007 100644
--- a/net/spdy/spdy_test_util_common.cc
+++ b/net/spdy/spdy_test_util_common.cc
@@ -501,8 +501,7 @@
ClientSocketPool::GroupId(key.host_port_pair(),
ClientSocketPool::SocketType::kSsl,
key.privacy_mode()),
- TransportClientSocketPool::SocketParams::CreateFromSSLSocketParams(
- ssl_params),
+ ClientSocketPool::SocketParams::CreateFromSSLSocketParams(ssl_params),
MEDIUM, key.socket_tag(), ClientSocketPool::RespectLimits::ENABLED,
callback.callback(), ClientSocketPool::ProxyAuthCallback(),
http_session->GetSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL,
diff --git a/net/websockets/websocket_basic_stream_adapters_test.cc b/net/websockets/websocket_basic_stream_adapters_test.cc
index f4d24c229..9fbc5db 100644
--- a/net/websockets/websocket_basic_stream_adapters_test.cc
+++ b/net/websockets/websocket_basic_stream_adapters_test.cc
@@ -113,8 +113,7 @@
ClientSocketPool::GroupId(host_port_pair_,
ClientSocketPool::SocketType::kSsl,
false /* privacy_mode */),
- TransportClientSocketPool::SocketParams::CreateFromSSLSocketParams(
- ssl_params_),
+ ClientSocketPool::SocketParams::CreateFromSSLSocketParams(ssl_params_),
MEDIUM, SocketTag(), ClientSocketPool::RespectLimits::ENABLED,
callback.callback(), ClientSocketPool::ProxyAuthCallback(),
socket_pool_manager_->GetSocketPool(ProxyServer::Direct()), net_log_);
