Chromium Code Reviews| 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..ffb5b43705e1a4dc6ff77215a1b193e121371ec2 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,22 @@ 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*>( |
|
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.
|
| + 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 WebSocketTransportClientSocketPo
Adam Rice
2014/06/11 05:33:41
It is used in client_socket_pool_manager.cc to imp
|
| ssl_pool_histograms_("SSL2"), |
| ssl_socket_pool_(new SSLClientSocketPool( |
| max_sockets_per_pool(pool_type), max_sockets_per_group(pool_type), |