net/socket/client_socket_pool_manager_impl.cc - Issue 240873003: Create WebSocketTransportClientSocketPool

Unified Diff: net/socket/client_socket_pool_manager_impl.cc

Issue 240873003: Create WebSocketTransportClientSocketPool (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Minor fixes and comment tidying. Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: net/socket/client_socket_pool_manager_impl.cc

diff --git a/net/socket/client_socket_pool_manager_impl.cc b/net/socket/client_socket_pool_manager_impl.cc

index 991278d7341c55bb758be8a88c70b7903c1d81c8..588eaf86e946ae458601f46b8ef950d635a5071a 100644

--- a/net/socket/client_socket_pool_manager_impl.cc

+++ b/net/socket/client_socket_pool_manager_impl.cc

@@ -11,6 +11,7 @@

#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 {

@@ -57,28 +58,38 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(

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

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

« base/containers/linked_list.h ('K') | « net/net.gyp ('k') | net/socket/websocket_transport_client_socket_pool.h » ('j') | net/socket/websocket_transport_client_socket_pool.cc » ('J')