| Index: net/socket/client_socket_pool_manager_impl.cc
|
| diff --git a/net/socket/client_socket_pool_manager_impl.cc b/net/socket/client_socket_pool_manager_impl.cc
|
| index 3159c0983f708792ad3d8ab6894540d127f9465c..a4f9b722ca3cc366225e47a132e543d29e156557 100644
|
| --- a/net/socket/client_socket_pool_manager_impl.cc
|
| +++ b/net/socket/client_socket_pool_manager_impl.cc
|
| @@ -41,6 +41,7 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
|
| TransportSecurityState* transport_security_state,
|
| DnsCertProvenanceChecker* dns_cert_checker,
|
| SSLHostInfoFactory* ssl_host_info_factory,
|
| + const std::string& ssl_session_cache_shard,
|
| ProxyService* proxy_service,
|
| SSLConfigService* ssl_config_service)
|
| : net_log_(net_log),
|
| @@ -51,6 +52,7 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
|
| transport_security_state_(transport_security_state),
|
| dns_cert_checker_(dns_cert_checker),
|
| ssl_host_info_factory_(ssl_host_info_factory),
|
| + ssl_session_cache_shard_(ssl_session_cache_shard),
|
| proxy_service_(proxy_service),
|
| ssl_config_service_(ssl_config_service),
|
| transport_pool_histograms_("TCP"),
|
| @@ -70,6 +72,7 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
|
| transport_security_state,
|
| dns_cert_checker,
|
| ssl_host_info_factory,
|
| + ssl_session_cache_shard,
|
| socket_factory,
|
| transport_socket_pool_.get(),
|
| NULL /* no socks proxy */,
|
| @@ -290,6 +293,7 @@ ClientSocketPoolManagerImpl::GetSocketPoolForHTTPProxy(
|
| transport_security_state_,
|
| dns_cert_checker_,
|
| ssl_host_info_factory_,
|
| + ssl_session_cache_shard_,
|
| socket_factory_,
|
| tcp_https_ret.first->second /* https proxy */,
|
| NULL /* no socks proxy */,
|
| @@ -329,6 +333,7 @@ SSLClientSocketPool* ClientSocketPoolManagerImpl::GetSocketPoolForSSLWithProxy(
|
| transport_security_state_,
|
| dns_cert_checker_,
|
| ssl_host_info_factory_,
|
| + ssl_session_cache_shard_,
|
| socket_factory_,
|
| NULL, /* no tcp pool, we always go through a proxy */
|
| GetSocketPoolForSOCKSProxy(proxy_server),
|
|
|