diff options
Diffstat (limited to 'net/socket/client_socket_pool_manager.cc')
| -rw-r--r-- | net/socket/client_socket_pool_manager.cc | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc index 0313db4..182eb18 100644 --- a/net/socket/client_socket_pool_manager.cc +++ b/net/socket/client_socket_pool_manager.cc @@ -1,5 +1,4 @@ // Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Copyright (c) 2011, 2012 Code Aurora Forum. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -254,8 +253,7 @@ ClientSocketPoolManager::ClientSocketPoolManager( DnsCertProvenanceChecker* dns_cert_checker, SSLHostInfoFactory* ssl_host_info_factory, ProxyService* proxy_service, - SSLConfigService* ssl_config_service, - HttpNetworkSession *network_session) + SSLConfigService* ssl_config_service) : net_log_(net_log), socket_factory_(socket_factory), host_resolver_(host_resolver), @@ -271,8 +269,7 @@ ClientSocketPoolManager::ClientSocketPoolManager( &transport_pool_histograms_, host_resolver, socket_factory_, - net_log, - network_session)), + net_log)), ssl_pool_histograms_("SSL2"), ssl_socket_pool_(new SSLClientSocketPool( g_max_sockets, g_max_sockets_per_group, @@ -287,8 +284,7 @@ ClientSocketPoolManager::ClientSocketPoolManager( NULL /* no socks proxy */, NULL /* no http proxy */, ssl_config_service, - net_log, - network_session)), + net_log)), transport_for_socks_pool_histograms_("TCPforSOCKS"), socks_pool_histograms_("SOCK"), transport_for_http_proxy_pool_histograms_("TCPforHTTPProxy"), @@ -421,8 +417,7 @@ SOCKSClientSocketPool* ClientSocketPoolManager::GetSocketPoolForSOCKSProxy( &transport_for_socks_pool_histograms_, host_resolver_, socket_factory_, - net_log_, - NULL))); + net_log_))); DCHECK(tcp_ret.second); std::pair<SOCKSSocketPoolMap::iterator, bool> ret = @@ -432,8 +427,7 @@ SOCKSClientSocketPool* ClientSocketPoolManager::GetSocketPoolForSOCKSProxy( &socks_pool_histograms_, host_resolver_, tcp_ret.first->second, - net_log_, - NULL))); + net_log_))); return ret.first->second; } @@ -462,8 +456,7 @@ HttpProxyClientSocketPool* ClientSocketPoolManager::GetSocketPoolForHTTPProxy( &transport_for_http_proxy_pool_histograms_, host_resolver_, socket_factory_, - net_log_, - NULL))); + net_log_))); DCHECK(tcp_http_ret.second); std::pair<TransportSocketPoolMap::iterator, bool> tcp_https_ret = @@ -475,8 +468,7 @@ HttpProxyClientSocketPool* ClientSocketPoolManager::GetSocketPoolForHTTPProxy( &transport_for_https_proxy_pool_histograms_, host_resolver_, socket_factory_, - net_log_, - NULL))); + net_log_))); DCHECK(tcp_https_ret.second); std::pair<SSLSocketPoolMap::iterator, bool> ssl_https_ret = @@ -495,8 +487,7 @@ HttpProxyClientSocketPool* ClientSocketPoolManager::GetSocketPoolForHTTPProxy( tcp_https_ret.first->second /* https proxy */, NULL /* no socks proxy */, NULL /* no http proxy */, - ssl_config_service_, net_log_, - NULL))); + ssl_config_service_, net_log_))); DCHECK(tcp_https_ret.second); std::pair<HTTPProxySocketPoolMap::iterator, bool> ret = @@ -509,8 +500,7 @@ HttpProxyClientSocketPool* ClientSocketPoolManager::GetSocketPoolForHTTPProxy( host_resolver_, tcp_http_ret.first->second, ssl_https_ret.first->second, - net_log_, - NULL))); + net_log_))); return ret.first->second; } @@ -535,8 +525,7 @@ SSLClientSocketPool* ClientSocketPoolManager::GetSocketPoolForSSLWithProxy( GetSocketPoolForSOCKSProxy(proxy_server), GetSocketPoolForHTTPProxy(proxy_server), ssl_config_service_, - net_log_, - NULL); + net_log_); std::pair<SSLSocketPoolMap::iterator, bool> ret = ssl_socket_pools_for_proxies_.insert(std::make_pair(proxy_server, |