| Index: net/socket/client_socket_pool_manager.cc
|
| ===================================================================
|
| --- net/socket/client_socket_pool_manager.cc (revision 62921)
|
| +++ net/socket/client_socket_pool_manager.cc (working copy)
|
| @@ -56,14 +56,12 @@
|
| 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"),
|
| @@ -79,7 +77,6 @@
|
| &ssl_pool_histograms_,
|
| host_resolver,
|
| dnsrr_resolver,
|
| - ssl_host_info_factory,
|
| socket_factory,
|
| tcp_socket_pool_.get(),
|
| NULL /* no socks proxy */,
|
| @@ -228,7 +225,6 @@
|
| &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 */,
|
| @@ -263,7 +259,6 @@
|
| &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),
|
|
|