| Index: net/socket/client_socket_pool_manager.cc
|
| diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
|
| index 0fca83db3856c6942d39cc685115824a10339791..512360bba0ede68ee69fc888e7b7d1802406cf2a 100644
|
| --- a/net/socket/client_socket_pool_manager.cc
|
| +++ b/net/socket/client_socket_pool_manager.cc
|
| @@ -56,12 +56,14 @@ ClientSocketPoolManager::ClientSocketPoolManager(
|
| ClientSocketFactory* socket_factory,
|
| HostResolver* host_resolver,
|
| DnsRRResolver* dnsrr_resolver,
|
| + SSLHostInfoFactory* ssl_host_info_factory,
|
| ProxyService* proxy_service,
|
| SSLConfigService* ssl_config_service)
|
| : net_log_(net_log),
|
| socket_factory_(socket_factory),
|
| host_resolver_(host_resolver),
|
| dnsrr_resolver_(dnsrr_resolver),
|
| + ssl_host_info_factory_(ssl_host_info_factory),
|
| proxy_service_(proxy_service),
|
| ssl_config_service_(ssl_config_service),
|
| tcp_pool_histograms_("TCP"),
|
| @@ -77,6 +79,7 @@ ClientSocketPoolManager::ClientSocketPoolManager(
|
| &ssl_pool_histograms_,
|
| host_resolver,
|
| dnsrr_resolver,
|
| + ssl_host_info_factory,
|
| socket_factory,
|
| tcp_socket_pool_.get(),
|
| NULL /* no socks proxy */,
|
| @@ -225,6 +228,7 @@ HttpProxyClientSocketPool* ClientSocketPoolManager::GetSocketPoolForHTTPProxy(
|
| &ssl_for_https_proxy_pool_histograms_,
|
| host_resolver_,
|
| dnsrr_resolver_,
|
| + ssl_host_info_factory_,
|
| socket_factory_,
|
| tcp_https_ret.first->second /* https proxy */,
|
| NULL /* no socks proxy */,
|
| @@ -259,6 +263,7 @@ SSLClientSocketPool* ClientSocketPoolManager::GetSocketPoolForSSLWithProxy(
|
| &ssl_pool_histograms_,
|
| host_resolver_,
|
| dnsrr_resolver_,
|
| + ssl_host_info_factory_,
|
| socket_factory_,
|
| NULL, /* no tcp pool, we always go through a proxy */
|
| GetSocketPoolForSOCKSProxy(proxy_server),
|
|
|