Increase number of max sockets per group for WebSocket connections.

net/socket/client_socket_pool_manager_impl.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/socket/client_socket_pool_manager_impl.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "net/base/ssl_config_service.h"
 #include "net/http/http_proxy_client_socket_pool.h"
+#include "net/http/http_network_session.h"
 #include "net/socket/socks_client_socket_pool.h"
 #include "net/socket/ssl_client_socket_pool.h"
 #include "net/socket/transport_client_socket_pool.h"
 
 namespace net {
 
 namespace {
 
 // Appends information about all |socket_pools| to the end of |list|.
 template <class MapType>
@@ skipping 14 matching lines @@
 ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
     NetLog* net_log,
     ClientSocketFactory* socket_factory,
     HostResolver* host_resolver,
     CertVerifier* cert_verifier,
     OriginBoundCertService* origin_bound_cert_service,
     TransportSecurityState* transport_security_state,
     SSLHostInfoFactory* ssl_host_info_factory,
     const std::string& ssl_session_cache_shard,
     ProxyService* proxy_service,
-    SSLConfigService* ssl_config_service)
+    SSLConfigService* ssl_config_service,
+    HttpNetworkSession::SocketPoolType pool_type)
     : net_log_(net_log),
       socket_factory_(socket_factory),
       host_resolver_(host_resolver),
       cert_verifier_(cert_verifier),
       origin_bound_cert_service_(origin_bound_cert_service),
       transport_security_state_(transport_security_state),
       ssl_host_info_factory_(ssl_host_info_factory),
       ssl_session_cache_shard_(ssl_session_cache_shard),
       proxy_service_(proxy_service),
       ssl_config_service_(ssl_config_service),
+      pool_type_(pool_type),
       transport_pool_histograms_("TCP"),
       transport_socket_pool_(new TransportClientSocketPool(
-          max_sockets_per_pool(), max_sockets_per_group(),
+          max_sockets_per_pool(pool_type), max_sockets_per_group(pool_type),
           &transport_pool_histograms_,
           host_resolver,
           socket_factory_,
           net_log)),
       ssl_pool_histograms_("SSL2"),
       ssl_socket_pool_(new SSLClientSocketPool(
-          max_sockets_per_pool(), max_sockets_per_group(),
+          max_sockets_per_pool(pool_type), max_sockets_per_group(pool_type),
           &ssl_pool_histograms_,
           host_resolver,
           cert_verifier,
           origin_bound_cert_service,
           transport_security_state,
           ssl_host_info_factory,
           ssl_session_cache_shard,
           socket_factory,
           transport_socket_pool_.get(),
           NULL /* no socks proxy */,
@@ skipping 130 matching lines @@
     return it->second;
   }
 
   DCHECK(!ContainsKey(transport_socket_pools_for_socks_proxies_, socks_proxy));
 
   std::pair<TransportSocketPoolMap::iterator, bool> tcp_ret =
       transport_socket_pools_for_socks_proxies_.insert(
           std::make_pair(
               socks_proxy,
               new TransportClientSocketPool(
-                  max_sockets_per_proxy_server(),
-                  max_sockets_per_group(),
+                  max_sockets_per_proxy_server(pool_type_),
+                  max_sockets_per_group(pool_type_),
                   &transport_for_socks_pool_histograms_,
                   host_resolver_,
                   socket_factory_,
                   net_log_)));
   DCHECK(tcp_ret.second);
 
   std::pair<SOCKSSocketPoolMap::iterator, bool> ret =
       socks_socket_pools_.insert(
           std::make_pair(socks_proxy, new SOCKSClientSocketPool(
-              max_sockets_per_proxy_server(),
-              max_sockets_per_group(),
+              max_sockets_per_proxy_server(pool_type_),
+              max_sockets_per_group(pool_type_),
               &socks_pool_histograms_,
               host_resolver_,
               tcp_ret.first->second,
               net_log_)));
 
   return ret.first->second;
 }
 
 HttpProxyClientSocketPool*
 ClientSocketPoolManagerImpl::GetSocketPoolForHTTPProxy(
     const HostPortPair& http_proxy) {
   HTTPProxySocketPoolMap::const_iterator it =
       http_proxy_socket_pools_.find(http_proxy);
   if (it != http_proxy_socket_pools_.end()) {
     DCHECK(ContainsKey(transport_socket_pools_for_http_proxies_, http_proxy));
     DCHECK(ContainsKey(transport_socket_pools_for_https_proxies_, http_proxy));
     DCHECK(ContainsKey(ssl_socket_pools_for_https_proxies_, http_proxy));
     return it->second;
   }
 
   DCHECK(!ContainsKey(transport_socket_pools_for_http_proxies_, http_proxy));
   DCHECK(!ContainsKey(transport_socket_pools_for_https_proxies_, http_proxy));
   DCHECK(!ContainsKey(ssl_socket_pools_for_https_proxies_, http_proxy));
 
   std::pair<TransportSocketPoolMap::iterator, bool> tcp_http_ret =
       transport_socket_pools_for_http_proxies_.insert(
           std::make_pair(
               http_proxy,
               new TransportClientSocketPool(
-                  max_sockets_per_proxy_server(),
-                  max_sockets_per_group(),
+                  max_sockets_per_proxy_server(pool_type_),
+                  max_sockets_per_group(pool_type_),
                   &transport_for_http_proxy_pool_histograms_,
                   host_resolver_,
                   socket_factory_,
                   net_log_)));
   DCHECK(tcp_http_ret.second);
 
   std::pair<TransportSocketPoolMap::iterator, bool> tcp_https_ret =
       transport_socket_pools_for_https_proxies_.insert(
           std::make_pair(
               http_proxy,
               new TransportClientSocketPool(
-                  max_sockets_per_proxy_server(),
-                  max_sockets_per_group(),
+                  max_sockets_per_proxy_server(pool_type_),
+                  max_sockets_per_group(pool_type_),
                   &transport_for_https_proxy_pool_histograms_,
                   host_resolver_,
                   socket_factory_,
                   net_log_)));
   DCHECK(tcp_https_ret.second);
 
   std::pair<SSLSocketPoolMap::iterator, bool> ssl_https_ret =
       ssl_socket_pools_for_https_proxies_.insert(
           std::make_pair(
               http_proxy,
               new SSLClientSocketPool(
-                  max_sockets_per_proxy_server(),
-                  max_sockets_per_group(),
+                  max_sockets_per_proxy_server(pool_type_),
+                  max_sockets_per_group(pool_type_),
                   &ssl_for_https_proxy_pool_histograms_,
                   host_resolver_,
                   cert_verifier_,
                   origin_bound_cert_service_,
                   transport_security_state_,
                   ssl_host_info_factory_,
                   ssl_session_cache_shard_,
                   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(
               http_proxy,
               new HttpProxyClientSocketPool(
-                  max_sockets_per_proxy_server(),
-                  max_sockets_per_group(),
+                  max_sockets_per_proxy_server(pool_type_),
+                  max_sockets_per_group(pool_type_),
                   &http_proxy_pool_histograms_,
                   host_resolver_,
                   tcp_http_ret.first->second,
                   ssl_https_ret.first->second,
                   net_log_)));
 
   return ret.first->second;
 }
 
 SSLClientSocketPool* ClientSocketPoolManagerImpl::GetSocketPoolForSSLWithProxy(
     const HostPortPair& proxy_server) {
   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(
-      max_sockets_per_proxy_server(), max_sockets_per_group(),
+      max_sockets_per_proxy_server(pool_type_),
+      max_sockets_per_group(pool_type_),
       &ssl_pool_histograms_,
       host_resolver_,
       cert_verifier_,
       origin_bound_cert_service_,
       transport_security_state_,
       ssl_host_info_factory_,
       ssl_session_cache_shard_,
       socket_factory_,
       NULL, /* no tcp pool, we always go through a proxy */
       GetSocketPoolForSOCKSProxy(proxy_server),
@@ skipping 50 matching lines @@
   // We should not flush the socket pools if we added trust to a
   // cert.
   //
   // Since the OnCertTrustChanged method doesn't tell us what
   // kind of trust change it is, we have to flush the socket
   // pools to be safe.
   FlushSocketPools();
 }
 
 }  // namespace net