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

net/socket/client_socket_pool_manager.h

 // 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.
 
 #ifndef NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_
 #define NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_
@@ skipping 16 matching lines @@
 class ClientSocketPoolHistograms;
 class DnsRRResolver;
 class HostPortPair;
 class HttpProxyClientSocketPool;
 class HostResolver;
 class NetLog;
 class ProxyService;
 class SOCKSClientSocketPool;
 class SSLClientSocketPool;
 class SSLConfigService;
-class SSLHostInfoFactory;
 class TCPClientSocketPool;
 
 namespace internal {
 
 // A helper class for auto-deleting Values in the destructor.
 template <typename Key, typename Value>
 class OwnedPoolMap : public std::map<Key, Value> {
  public:
   OwnedPoolMap() {
     COMPILE_ASSERT(base::is_pointer<Value>::value,
                    value_must_be_a_pointer);
   }
 
   ~OwnedPoolMap() {
     STLDeleteValues(this);
   }
 };
 
 }  // internal
 
 class ClientSocketPoolManager : public NonThreadSafe {
  public:
   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);
   ~ClientSocketPoolManager();
 
   void FlushSocketPools();
 
   TCPClientSocketPool* tcp_socket_pool() { return tcp_socket_pool_.get(); }
 
   SSLClientSocketPool* ssl_socket_pool() { return ssl_socket_pool_.get(); }
 
@@ skipping 22 matching lines @@
   typedef internal::OwnedPoolMap<HostPortPair, SOCKSClientSocketPool*>
       SOCKSSocketPoolMap;
   typedef internal::OwnedPoolMap<HostPortPair, HttpProxyClientSocketPool*>
       HTTPProxySocketPoolMap;
   typedef internal::OwnedPoolMap<HostPortPair, SSLClientSocketPool*>
       SSLSocketPoolMap;
 
   NetLog* const net_log_;
   ClientSocketFactory* const socket_factory_;
   HostResolver* const host_resolver_;
-  DnsRRResolver* const dnsrr_resolver_;
-  SSLHostInfoFactory* const ssl_host_info_factory_;
+  DnsRRResolver* dnsrr_resolver_;
   const scoped_refptr<ProxyService> proxy_service_;
   const scoped_refptr<SSLConfigService> ssl_config_service_;
 
   // Note: this ordering is important.
 
   ClientSocketPoolHistograms tcp_pool_histograms_;
   scoped_ptr<TCPClientSocketPool> tcp_socket_pool_;
 
   ClientSocketPoolHistograms ssl_pool_histograms_;
   scoped_ptr<SSLClientSocketPool> ssl_socket_pool_;
@@ skipping 18 matching lines @@
 
   ClientSocketPoolHistograms ssl_socket_pool_for_proxies_histograms_;
   SSLSocketPoolMap ssl_socket_pools_for_proxies_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolManager);
 };
 
 }  // namespace net
 
 #endif // NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_