Attempting to re-land CL 3110006 which turned out to have ...

net/http/http_network_session.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.
 
 #include "net/http/http_network_session.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
@@ skipping 28 matching lines @@
     ClientSocketFactory* client_socket_factory,
     SSLConfigService* ssl_config_service,
     SpdySessionPool* spdy_session_pool,
     HttpAuthHandlerFactory* http_auth_handler_factory,
     HttpNetworkDelegate* network_delegate,
     NetLog* net_log)
     : tcp_pool_histograms_(new ClientSocketPoolHistograms("TCP")),
       tcp_for_http_proxy_pool_histograms_(
           new ClientSocketPoolHistograms("TCPforHTTPProxy")),
       http_proxy_pool_histograms_(new ClientSocketPoolHistograms("HTTPProxy")),
+      tcp_for_https_proxy_pool_histograms_(
+          new ClientSocketPoolHistograms("TCPforHTTPSProxy")),
+      ssl_for_https_proxy_pool_histograms_(
+          new ClientSocketPoolHistograms("SSLforHTTPSProxy")),
       tcp_for_socks_pool_histograms_(
           new ClientSocketPoolHistograms("TCPforSOCKS")),
       socks_pool_histograms_(new ClientSocketPoolHistograms("SOCK")),
       ssl_pool_histograms_(new ClientSocketPoolHistograms("SSL")),
       tcp_socket_pool_(new TCPClientSocketPool(
           g_max_sockets, g_max_sockets_per_group, tcp_pool_histograms_,
           host_resolver, client_socket_factory, net_log)),
       ssl_socket_pool_(new SSLClientSocketPool(
           g_max_sockets, g_max_sockets_per_group, ssl_pool_histograms_,
           host_resolver, client_socket_factory, tcp_socket_pool_, NULL,
@@ skipping 25 matching lines @@
       http_proxy_socket_pools_.insert(
           std::make_pair(
               http_proxy,
               new HttpProxyClientSocketPool(
                   g_max_sockets_per_proxy_server, g_max_sockets_per_group,
                   http_proxy_pool_histograms_, host_resolver_,
                   new TCPClientSocketPool(
                       g_max_sockets_per_proxy_server, g_max_sockets_per_group,
                       tcp_for_http_proxy_pool_histograms_, host_resolver_,
                       socket_factory_, net_log_),
+                  new SSLClientSocketPool(
+                      g_max_sockets_per_proxy_server, g_max_sockets_per_group,
+                      ssl_for_https_proxy_pool_histograms_, host_resolver_,
+                      socket_factory_,
+                      new TCPClientSocketPool(
+                          g_max_sockets_per_proxy_server,
+                          g_max_sockets_per_group,
+                          tcp_for_https_proxy_pool_histograms_, host_resolver_,
+                          socket_factory_, net_log_),
+                          NULL, NULL, net_log_),
                   net_log_)));
 
   return ret.first->second;
 }
 
 const scoped_refptr<SOCKSClientSocketPool>&
 HttpNetworkSession::GetSocketPoolForSOCKSProxy(
     const HostPortPair& socks_proxy) {
   SOCKSSocketPoolMap::const_iterator it = socks_socket_pools_.find(socks_proxy);
   if (it != socks_socket_pools_.end())
@@ skipping 52 matching lines @@
 void HttpNetworkSession::set_max_sockets_per_proxy_server(int socket_count) {
   DCHECK_LT(0, socket_count);
   DCHECK_GT(100, socket_count);  // Sanity check.
   // Assert this case early on. The max number of sockets per group cannot
   // exceed the max number of sockets per proxy server.
   DCHECK_LE(g_max_sockets_per_group, socket_count);
   g_max_sockets_per_proxy_server = socket_count;
 }
 
 }  //  namespace net