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 6d0751b3f9bbb00dfa6506ba883ea2e1932b12ed..d436fe08423fd7526f39790b488e163432a6931c 100644 |
--- a/net/socket/client_socket_pool_manager_impl.cc |
+++ b/net/socket/client_socket_pool_manager_impl.cc |
@@ -46,7 +46,8 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl( |
const std::string& ssl_session_cache_shard, |
SSLConfigService* ssl_config_service, |
bool enable_ssl_connect_job_waiting, |
- HttpNetworkSession::SocketPoolType pool_type) |
+ HttpNetworkSession::SocketPoolType pool_type, |
+ SSLSocketConfigService* ssl_socket_config_service) |
: net_log_(net_log), |
socket_factory_(socket_factory), |
host_resolver_(host_resolver), |
@@ -91,14 +92,16 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl( |
NULL /* no http proxy */, |
ssl_config_service, |
enable_ssl_connect_job_waiting, |
- net_log)), |
+ net_log, |
+ ssl_socket_config_service)), |
transport_for_socks_pool_histograms_("TCPforSOCKS"), |
socks_pool_histograms_("SOCK"), |
transport_for_http_proxy_pool_histograms_("TCPforHTTPProxy"), |
transport_for_https_proxy_pool_histograms_("TCPforHTTPSProxy"), |
ssl_for_https_proxy_pool_histograms_("SSLforHTTPSProxy"), |
http_proxy_pool_histograms_("HTTPProxy"), |
- ssl_socket_pool_for_proxies_histograms_("SSLForProxies") { |
+ ssl_socket_pool_for_proxies_histograms_("SSLForProxies"), |
+ ssl_socket_config_service_(ssl_socket_config_service) { |
CertDatabase::GetInstance()->AddObserver(this); |
} |
@@ -304,7 +307,8 @@ ClientSocketPoolManagerImpl::GetSocketPoolForHTTPProxy( |
tcp_https_ret.first->second /* https proxy */, |
NULL /* no socks proxy */, NULL /* no http proxy */, |
ssl_config_service_.get(), |
- enable_ssl_connect_job_waiting_, net_log_))); |
+ enable_ssl_connect_job_waiting_, net_log_, |
+ ssl_socket_config_service_))); |
DCHECK(tcp_https_ret.second); |
std::pair<HTTPProxySocketPoolMap::iterator, bool> ret = |
@@ -338,7 +342,7 @@ SSLClientSocketPool* ClientSocketPoolManagerImpl::GetSocketPoolForSSLWithProxy( |
NULL, /* no tcp pool, we always go through a proxy */ |
GetSocketPoolForSOCKSProxy(proxy_server), |
GetSocketPoolForHTTPProxy(proxy_server), ssl_config_service_.get(), |
- enable_ssl_connect_job_waiting_, net_log_); |
+ enable_ssl_connect_job_waiting_, net_log_, ssl_socket_config_service_); |
std::pair<SSLSocketPoolMap::iterator, bool> ret = |
ssl_socket_pools_for_proxies_.insert(std::make_pair(proxy_server, |