Notify NQE of TCP RTT values

net/socket/client_socket_pool_manager_impl.cc

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..a9f21c152b7f7487cabb66f828cec22092057944 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),
@@ -88,6 +92,10 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
                                                ssl_config_service,
                                                net_log)) {
   CertDatabase::GetInstance()->AddObserver(this);
+  if (pool_type != HttpNetworkSession::WEBSOCKET_SOCKET_POOL) {

[bengr, 2016/02/08 18:51:14]

Do you think you should instead check that it is a NORMAL_SOCKET_POOL? I'm
concerned that this will break if another socket pool type is added.

[tbansal1, 2016/02/08 21:33:26]

Obsolete.

+    transport_socket_pool_->SetSocketPerformanceWatcherFactory(
+        socket_performance_watcher_factory_);
+  }
 }
 
 ClientSocketPoolManagerImpl::~ClientSocketPoolManagerImpl() {
@@ -259,28 +267,26 @@ ClientSocketPoolManagerImpl::GetSocketPoolForHTTPProxy(
   int sockets_per_group = std::min(sockets_per_proxy_server,
                                    max_sockets_per_group(pool_type_));
 
+  TransportClientSocketPool* transport_client_socket_pool_http =

[bengr, 2016/02/08 18:51:14]

Right now it's easy enough to see that ownership get passed to
transport_socket_pools_for_http_proxies_, but that relationship could get
fuzzier if anyone adds code between the here and the pass. Consider storing this
as a scoped_ptr and then releasing it when you pass. 

Same for line 281.

[tbansal1, 2016/02/08 21:33:26]

Obsolete.

+      new TransportClientSocketPool(sockets_per_proxy_server, sockets_per_group,
+                                    host_resolver_, socket_factory_, net_log_);
+  transport_client_socket_pool_http->SetSocketPerformanceWatcherFactory(
+      socket_performance_watcher_factory_);

[bengr, 2016/02/08 18:51:14]

Why isn't this part of the constructor?

[tbansal1, 2016/02/08 21:33:26]

Done. It required changed some more files. :)

+
   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_)));
+          std::make_pair(http_proxy, transport_client_socket_pool_http));
   DCHECK(tcp_http_ret.second);
 
+  TransportClientSocketPool* transport_client_socket_pool_https =
+      new TransportClientSocketPool(sockets_per_proxy_server, sockets_per_group,
+                                    host_resolver_, socket_factory_, net_log_);
+  transport_client_socket_pool_https->SetSocketPerformanceWatcherFactory(
+      socket_performance_watcher_factory_);
+
   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_)));
+          std::make_pair(http_proxy, transport_client_socket_pool_https));
   DCHECK(tcp_https_ret.second);
 
   std::pair<SSLSocketPoolMap::iterator, bool> ssl_https_ret =