Close idle sockets next time we are about to send data.

net/socket/client_socket_pool_manager.cc

Index: net/socket/client_socket_pool_manager.cc
diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
index 76b8715e566388760fcb0d89f79218985926a72e..5d503c338ff659908325f769e0fdbc1ca4e128f0 100644
--- a/net/socket/client_socket_pool_manager.cc
+++ b/net/socket/client_socket_pool_manager.cc
@@ -262,7 +262,8 @@ ClientSocketPoolManager::ClientSocketPoolManager(
     DnsCertProvenanceChecker* dns_cert_checker,
     SSLHostInfoFactory* ssl_host_info_factory,
     ProxyService* proxy_service,
-    SSLConfigService* ssl_config_service)
+    SSLConfigService* ssl_config_service,
+    bool use_cleanup_timer)
     : net_log_(net_log),
       socket_factory_(socket_factory),
       host_resolver_(host_resolver),
@@ -273,13 +274,15 @@ ClientSocketPoolManager::ClientSocketPoolManager(
       ssl_host_info_factory_(ssl_host_info_factory),
       proxy_service_(proxy_service),
       ssl_config_service_(ssl_config_service),
+      options_(use_cleanup_timer),
       transport_pool_histograms_("TCP"),
       transport_socket_pool_(new TransportClientSocketPool(
           g_max_sockets_per_pool, g_max_sockets_per_group,
           &transport_pool_histograms_,
           host_resolver,
           socket_factory_,
-          net_log)),
+          net_log,
+          options_)),
       ssl_pool_histograms_("SSL2"),
       ssl_socket_pool_(new SSLClientSocketPool(
           g_max_sockets_per_pool, g_max_sockets_per_group,
@@ -295,7 +298,9 @@ ClientSocketPoolManager::ClientSocketPoolManager(
           NULL /* no socks proxy */,
           NULL /* no http proxy */,
           ssl_config_service,
-          net_log)),
+          net_log,
+          options_)),
+
       transport_for_socks_pool_histograms_("TCPforSOCKS"),
       socks_pool_histograms_("SOCK"),
       transport_for_http_proxy_pool_histograms_("TCPforHTTPProxy"),
@@ -428,7 +433,8 @@ SOCKSClientSocketPool* ClientSocketPoolManager::GetSocketPoolForSOCKSProxy(
                   &transport_for_socks_pool_histograms_,
                   host_resolver_,
                   socket_factory_,
-                  net_log_)));
+                  net_log_,
+                  options_)));
   DCHECK(tcp_ret.second);
 
   std::pair<SOCKSSocketPoolMap::iterator, bool> ret =
@@ -438,7 +444,8 @@ SOCKSClientSocketPool* ClientSocketPoolManager::GetSocketPoolForSOCKSProxy(
               &socks_pool_histograms_,
               host_resolver_,
               tcp_ret.first->second,
-              net_log_)));
+              net_log_,
+              options_)));
 
   return ret.first->second;
 }
@@ -467,7 +474,8 @@ HttpProxyClientSocketPool* ClientSocketPoolManager::GetSocketPoolForHTTPProxy(
                   &transport_for_http_proxy_pool_histograms_,
                   host_resolver_,
                   socket_factory_,
-                  net_log_)));
+                  net_log_,
+                  options_)));
   DCHECK(tcp_http_ret.second);
 
   std::pair<TransportSocketPoolMap::iterator, bool> tcp_https_ret =
@@ -479,7 +487,8 @@ HttpProxyClientSocketPool* ClientSocketPoolManager::GetSocketPoolForHTTPProxy(
                   &transport_for_https_proxy_pool_histograms_,
                   host_resolver_,
                   socket_factory_,
-                  net_log_)));
+                  net_log_,
+                  options_)));
   DCHECK(tcp_https_ret.second);
 
   std::pair<SSLSocketPoolMap::iterator, bool> ssl_https_ret =
@@ -499,7 +508,9 @@ HttpProxyClientSocketPool* ClientSocketPoolManager::GetSocketPoolForHTTPProxy(
                   tcp_https_ret.first->second /* https proxy */,
                   NULL /* no socks proxy */,
                   NULL /* no http proxy */,
-                  ssl_config_service_, net_log_)));
+                  ssl_config_service_,
+                  net_log_,
+                  options_)));
   DCHECK(tcp_https_ret.second);
 
   std::pair<HTTPProxySocketPoolMap::iterator, bool> ret =
@@ -512,7 +523,8 @@ HttpProxyClientSocketPool* ClientSocketPoolManager::GetSocketPoolForHTTPProxy(
                   host_resolver_,
                   tcp_http_ret.first->second,
                   ssl_https_ret.first->second,
-                  net_log_)));
+                  net_log_,
+                  options_)));
 
   return ret.first->second;
 }
@@ -538,8 +550,8 @@ SSLClientSocketPool* ClientSocketPoolManager::GetSocketPoolForSSLWithProxy(
       GetSocketPoolForSOCKSProxy(proxy_server),
       GetSocketPoolForHTTPProxy(proxy_server),
       ssl_config_service_,
-      net_log_);
-
+      net_log_,
+      options_);
   std::pair<SSLSocketPoolMap::iterator, bool> ret =
       ssl_socket_pools_for_proxies_.insert(std::make_pair(proxy_server,
                                                           new_pool));