Create WebSocketTransportClientSocketPool

net/socket/client_socket_pool_manager_impl.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/socket/client_socket_pool_manager_impl.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_proxy_client_socket_pool.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"
+#include "net/socket/websocket_transport_client_socket_pool.h"
 #include "net/ssl/ssl_config_service.h"
 
 namespace net {
 
 namespace {
 
 // Appends information about all |socket_pools| to the end of |list|.
 template <class MapType>
 void AddSocketPoolsToList(base::ListValue* list,
                           const MapType& socket_pools,
@@ skipping 26 matching lines @@
       host_resolver_(host_resolver),
       cert_verifier_(cert_verifier),
       server_bound_cert_service_(server_bound_cert_service),
       transport_security_state_(transport_security_state),
       cert_transparency_verifier_(cert_transparency_verifier),
       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(pool_type), max_sockets_per_group(pool_type),
-          &transport_pool_histograms_,
-          host_resolver,
-          socket_factory_,
-          net_log)),
+      transport_socket_pool_(
+          pool_type == HttpNetworkSession::WEBSOCKET_SOCKET_POOL
+              ? static_cast<TransportClientSocketPool*>(
+                    new WebSocketTransportClientSocketPool(
+                        max_sockets_per_pool(pool_type),
+                        max_sockets_per_group(pool_type),
+                        &transport_pool_histograms_,
+                        host_resolver,
+                        socket_factory_,
+                        net_log))
+              : new TransportClientSocketPool(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(pool_type), max_sockets_per_group(pool_type),
-          &ssl_pool_histograms_,
-          host_resolver,
-          cert_verifier,
-          server_bound_cert_service,
-          transport_security_state,
-          cert_transparency_verifier,
-          ssl_session_cache_shard,
-          socket_factory,
-          transport_socket_pool_.get(),
-          NULL /* no socks proxy */,
-          NULL /* no http proxy */,
-          ssl_config_service,
-          net_log)),
+      ssl_socket_pool_(new SSLClientSocketPool(max_sockets_per_pool(pool_type),
+                                               max_sockets_per_group(pool_type),
+                                               &ssl_pool_histograms_,
+                                               host_resolver,
+                                               cert_verifier,
+                                               server_bound_cert_service,
+                                               transport_security_state,
+                                               cert_transparency_verifier,
+                                               ssl_session_cache_shard,
+                                               socket_factory,
+                                               transport_socket_pool_.get(),
+                                               NULL /* no socks proxy */,
+                                               NULL /* no http proxy */,
+                                               ssl_config_service,
+                                               net_log)),

[tyoshino (SeeGerritForStatus), 2014/05/22 05:20:03]

please revert style only change so that reviewers won't be distracted for them.

feel free to send style only fixes if you found some and weigh on your mind.

[Adam Rice, 2014/05/22 06:49:07]

Done.

       transport_for_socks_pool_histograms_("TCPforSOCKS"),
       socks_pool_histograms_("SOCK"),
       transport_for_http_proxy_pool_histograms_("TCPforHTTPProxy"),
       transport_for_https_proxy_pool_histograms_("TCPforHTTPSProxy"),
       ssl_for_https_proxy_pool_histograms_("SSLforHTTPSProxy"),
       http_proxy_pool_histograms_("HTTPProxy"),
       ssl_socket_pool_for_proxies_histograms_("SSLForProxies") {
   CertDatabase::GetInstance()->AddObserver(this);
 }
 
@@ skipping 296 matching lines @@
   // We should not flush the socket pools if we added trust to a
   // cert.
   //
   // Since the OnCACertChanged method doesn't tell us what
   // kind of change it is, we have to flush the socket
   // pools to be safe.
   FlushSocketPoolsWithError(ERR_NETWORK_CHANGED);
 }
 
 }  // namespace net