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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Factor out CurrentAddress() method in SubJob class. Created 6 years, 6 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..da73122e53fc44b6eda116e37f8880d988644165 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,12 +58,21 @@ 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

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

« no previous file with comments | « net/net.gypi ('k') | net/socket/transport_client_socket_pool.h » ('j') | net/socket/transport_client_socket_pool.h » ('J')