Increase number of max sockets per group for WebSocket connections.

net/http/http_network_session.cc

 // 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/http/http_network_session.h"
 
 #include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_response_body_drainer.h"
 #include "net/http/http_stream_factory_impl.h"
 #include "net/http/url_security_manager.h"
 #include "net/proxy/proxy_service.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/client_socket_pool_manager_impl.h"
 #include "net/spdy/spdy_session_pool.h"
 
 namespace {
 
 net::ClientSocketPoolManager* CreateSocketPoolManager(
+    net::HttpNetworkSession::SocketPoolType pool_type,
     const net::HttpNetworkSession::Params& params) {
   // TODO(yutak): Differentiate WebSocket pool manager and allow more
   // simultaneous connections for WebSockets.
   return new net::ClientSocketPoolManagerImpl(
       params.net_log,
       params.client_socket_factory ?
       params.client_socket_factory :
       net::ClientSocketFactory::GetDefaultFactory(),
       params.host_resolver,
       params.cert_verifier,
       params.origin_bound_cert_service,
       params.transport_security_state,
       params.ssl_host_info_factory,
       params.ssl_session_cache_shard,
       params.proxy_service,
-      params.ssl_config_service);
+      params.ssl_config_service,
+      pool_type);
 }
 
 }  // unnamed namespace
 
 namespace net {
 
 // TODO(mbelshe): Move the socket factories into HttpStreamFactory.
 HttpNetworkSession::HttpNetworkSession(const Params& params)
     : net_log_(params.net_log),
       network_delegate_(params.network_delegate),
       http_server_properties_(params.http_server_properties),
       cert_verifier_(params.cert_verifier),
       http_auth_handler_factory_(params.http_auth_handler_factory),
       force_http_pipelining_(params.force_http_pipelining),
       proxy_service_(params.proxy_service),
       ssl_config_service_(params.ssl_config_service),
-      normal_socket_pool_manager_(CreateSocketPoolManager(params)),
-      websocket_socket_pool_manager_(CreateSocketPoolManager(params)),
+      normal_socket_pool_manager_(
+          CreateSocketPoolManager(NORMAL_SOCKET_POOL, params)),
+      websocket_socket_pool_manager_(
+          CreateSocketPoolManager(WEBSOCKET_SOCKET_POOL, params)),
       spdy_session_pool_(params.host_resolver,
                          params.ssl_config_service,
                          params.http_server_properties),
       ALLOW_THIS_IN_INITIALIZER_LIST(http_stream_factory_(
           new HttpStreamFactoryImpl(this))),
       params_(params) {
   DCHECK(proxy_service_);
   DCHECK(ssl_config_service_);
   CHECK(http_server_properties_);
 }
@@ skipping 65 matching lines @@
   spdy_session_pool_.CloseIdleSessions();
 }
 
 ClientSocketPoolManager* HttpNetworkSession::GetSocketPoolManager(
     SocketPoolType pool_type) {
   switch (pool_type) {
     case NORMAL_SOCKET_POOL:
       return normal_socket_pool_manager_.get();
     case WEBSOCKET_SOCKET_POOL:
       return websocket_socket_pool_manager_.get();
+    default:
+      NOTREACHED();
+      break;

[Yuta Kitamura, 2012/03/21 00:47:02]

This change was necessary to avoid a compiler warning ("switch cases are not
exhaustive").

   }
-  NOTREACHED();
   return NULL;
 }
 
 }  //  namespace net