Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1431)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/client_socket_pool_manager_impl.cc

Issue 1376473003: Notify NQE of TCP RTT values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed rsleevi comments Created 4 years, 10 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
« net/base/socket_performance_watcher_factory.h ('K') | « net/socket/client_socket_pool_manager_impl.h ('k') | net/socket/socket_test_util.h » ('j') | net/socket/tcp_socket_posix.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f2d512c2a91fabd4109958e7443586e9c4ebb93a..def70d0b459758017fbb7e0b00e64c248e6d32b1 100644
--- a/net/socket/client_socket_pool_manager_impl.cc
+++ b/net/socket/client_socket_pool_manager_impl.cc
@@ -19,6 +19,8 @@
namespace net {
+class SocketPerformanceWatcherFactory;
+
namespace {
// Appends information about all |socket_pools| to the end of |list|.
@@ -40,6 +42,7 @@ void AddSocketPoolsToList(base::ListValue* list,
ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
NetLog* net_log,
ClientSocketFactory* socket_factory,
+ SocketPerformanceWatcherFactory* socket_performance_watcher_factory,
HostResolver* host_resolver,
CertVerifier* cert_verifier,
ChannelIDService* channel_id_service,
@@ -51,6 +54,7 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
HttpNetworkSession::SocketPoolType pool_type)
: net_log_(net_log),
socket_factory_(socket_factory),
+ socket_performance_watcher_factory_(socket_performance_watcher_factory),
host_resolver_(host_resolver),
cert_verifier_(cert_verifier),
channel_id_service_(channel_id_service),
@@ -60,19 +64,21 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
ssl_session_cache_shard_(ssl_session_cache_shard),
ssl_config_service_(ssl_config_service),
pool_type_(pool_type),
- transport_socket_pool_(
- pool_type == HttpNetworkSession::WEBSOCKET_SOCKET_POOL
- ? new WebSocketTransportClientSocketPool(
- max_sockets_per_pool(pool_type),
- max_sockets_per_group(pool_type),
- host_resolver,
- socket_factory_,
- net_log)
- : new TransportClientSocketPool(max_sockets_per_pool(pool_type),
- max_sockets_per_group(pool_type),
- 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),
+ host_resolver,
+ socket_factory_,
+ net_log)
+ : new TransportClientSocketPool(
+ max_sockets_per_pool(pool_type),
+ max_sockets_per_group(pool_type),
+ host_resolver,
+ socket_factory_,
+ socket_performance_watcher_factory_,
+ net_log)),
ssl_socket_pool_(new SSLClientSocketPool(max_sockets_per_pool(pool_type),
max_sockets_per_group(pool_type),
cert_verifier,
@@ -216,25 +222,19 @@ SOCKSClientSocketPool* ClientSocketPoolManagerImpl::GetSocketPoolForSOCKSProxy(
max_sockets_per_group(pool_type_));
std::pair<TransportSocketPoolMap::iterator, bool> tcp_ret =
- transport_socket_pools_for_socks_proxies_.insert(
- std::make_pair(
- socks_proxy,
- new TransportClientSocketPool(
- sockets_per_proxy_server,
- sockets_per_group,
- host_resolver_,
- socket_factory_,
- net_log_)));
+ transport_socket_pools_for_socks_proxies_.insert(std::make_pair(
+ socks_proxy,
+ new TransportClientSocketPool(sockets_per_proxy_server,
+ sockets_per_group, host_resolver_,
+ socket_factory_, nullptr, net_log_)));
DCHECK(tcp_ret.second);
std::pair<SOCKSSocketPoolMap::iterator, bool> ret =
- socks_socket_pools_.insert(
- std::make_pair(socks_proxy, new SOCKSClientSocketPool(
- sockets_per_proxy_server,
- sockets_per_group,
- host_resolver_,
- tcp_ret.first->second,
- net_log_)));
+ socks_socket_pools_.insert(std::make_pair(
+ socks_proxy,
+ new SOCKSClientSocketPool(sockets_per_proxy_server, sockets_per_group,
+ host_resolver_, tcp_ret.first->second,
+ nullptr, net_log_)));
return ret.first->second;
}
@@ -260,27 +260,19 @@ ClientSocketPoolManagerImpl::GetSocketPoolForHTTPProxy(
max_sockets_per_group(pool_type_));
std::pair<TransportSocketPoolMap::iterator, bool> tcp_http_ret =
- transport_socket_pools_for_http_proxies_.insert(
- std::make_pair(
- http_proxy,
- new TransportClientSocketPool(
- sockets_per_proxy_server,
- sockets_per_group,
- host_resolver_,
- socket_factory_,
- net_log_)));
+ transport_socket_pools_for_http_proxies_.insert(std::make_pair(
+ http_proxy,
+ new TransportClientSocketPool(
+ sockets_per_proxy_server, sockets_per_group, host_resolver_,
+ socket_factory_, socket_performance_watcher_factory_, net_log_)));
DCHECK(tcp_http_ret.second);
std::pair<TransportSocketPoolMap::iterator, bool> tcp_https_ret =
- transport_socket_pools_for_https_proxies_.insert(
- std::make_pair(
- http_proxy,
- new TransportClientSocketPool(
- sockets_per_proxy_server,
- sockets_per_group,
- host_resolver_,
- socket_factory_,
- net_log_)));
+ transport_socket_pools_for_https_proxies_.insert(std::make_pair(
+ http_proxy,
+ new TransportClientSocketPool(
+ sockets_per_proxy_server, sockets_per_group, host_resolver_,
+ socket_factory_, socket_performance_watcher_factory_, net_log_)));
DCHECK(tcp_https_ret.second);
std::pair<SSLSocketPoolMap::iterator, bool> ssl_https_ret =
« net/base/socket_performance_watcher_factory.h ('K') | « net/socket/client_socket_pool_manager_impl.h ('k') | net/socket/socket_test_util.h » ('j') | net/socket/tcp_socket_posix.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698