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*>(

[tyoshino (SeeGerritForStatus), 2014/06/11 06:46:45]

remove static_cast?

[Adam Rice, 2014/06/11 08:17:09]

I didn't think it would compile without the cast. I was wrong. Thanks.

+                    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)),

[tyoshino (SeeGerritForStatus), 2014/06/11 03:32:54]

do we need to set WebSocketTransportClientSocketPool to transport_socket_pool_?

[Adam Rice, 2014/06/11 05:33:41]

It is used in client_socket_pool_manager.cc to implement InitSocketPoolHelper().
It may be possible to export it separately, but it would involve even more
extensive changes.

       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,
@@ skipping 312 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