Revert 62918 - net: clean up SSLHostInfo construction....

net/socket/client_socket_pool_manager.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // ClientSocketPoolManager manages access to all ClientSocketPools.  It's a
 // simple container for all of them.  Most importantly, it handles the lifetime
 // and destruction order properly.
 
 #include "net/socket/client_socket_pool_manager.h"
 
@@ skipping 38 matching lines @@
   }
 }
 
 }  // namespace
 
 ClientSocketPoolManager::ClientSocketPoolManager(
     NetLog* net_log,
     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"),
       tcp_socket_pool_(new TCPClientSocketPool(
           g_max_sockets, g_max_sockets_per_group,
           &tcp_pool_histograms_,
           host_resolver,
           socket_factory_,
           net_log)),
       ssl_pool_histograms_("SSL2"),
       ssl_socket_pool_(new SSLClientSocketPool(
           g_max_sockets, g_max_sockets_per_group,
           &ssl_pool_histograms_,
           host_resolver,
           dnsrr_resolver,
-          ssl_host_info_factory,
           socket_factory,
           tcp_socket_pool_.get(),
           NULL /* no socks proxy */,
           NULL /* no http proxy */,
           ssl_config_service,
           net_log)),
       tcp_for_socks_pool_histograms_("TCPforSOCKS"),
       socks_pool_histograms_("SOCK"),
       tcp_for_http_proxy_pool_histograms_("TCPforHTTPProxy"),
       tcp_for_https_proxy_pool_histograms_("TCPforHTTPSProxy"),
@@ skipping 128 matching lines @@
 
   std::pair<SSLSocketPoolMap::iterator, bool> ssl_https_ret =
       ssl_socket_pools_for_https_proxies_.insert(
           std::make_pair(
               http_proxy,
               new SSLClientSocketPool(
                   g_max_sockets_per_proxy_server, g_max_sockets_per_group,
                   &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 */,
                   NULL /* no http proxy */,
                   ssl_config_service_, net_log_)));
   DCHECK(tcp_https_ret.second);
 
   std::pair<HTTPProxySocketPoolMap::iterator, bool> ret =
       http_proxy_socket_pools_.insert(
           std::make_pair(
@@ skipping 14 matching lines @@
   SSLSocketPoolMap::const_iterator it =
       ssl_socket_pools_for_proxies_.find(proxy_server);
   if (it != ssl_socket_pools_for_proxies_.end())
     return it->second;
 
   SSLClientSocketPool* new_pool = new SSLClientSocketPool(
       g_max_sockets_per_proxy_server, g_max_sockets_per_group,
       &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),
       GetSocketPoolForHTTPProxy(proxy_server),
       ssl_config_service_,
       net_log_);
 
   std::pair<SSLSocketPoolMap::iterator, bool> ret =
       ssl_socket_pools_for_proxies_.insert(std::make_pair(proxy_server,
                                                           new_pool));
@@ skipping 50 matching lines @@
   // Third parameter is false because |ssl_socket_pools_for_proxies_| use
   // socket pools in |http_proxy_socket_pools_| and |socks_socket_pools_|.
   AddSocketPoolsToList(list,
                        ssl_socket_pools_for_proxies_,
                        "ssl_socket_pool_for_proxies",
                        false);
   return list;
 }
 
 }  // namespace net