Revert 127717 - Revert 118788 - Revert 113405 - Revert 113305 - Revert 113300 - Revert 112134 - Rev…

net/socket/socks_client_socket_pool.cc

Index: net/socket/socks_client_socket_pool.cc
===================================================================
--- net/socket/socks_client_socket_pool.cc	(revision 127728)
+++ net/socket/socks_client_socket_pool.cc	(working copy)
@@ -199,16 +199,9 @@
             new SOCKSConnectJobFactory(transport_pool,
                                        host_resolver,
                                        net_log)) {
-  // We should always have a |transport_pool_| except in unit tests.
-  if (transport_pool_)
-    transport_pool_->AddLayeredPool(this);
 }
 
-SOCKSClientSocketPool::~SOCKSClientSocketPool() {
-  // We should always have a |transport_pool_| except in unit tests.
-  if (transport_pool_)
-    transport_pool_->RemoveLayeredPool(this);
-}
+SOCKSClientSocketPool::~SOCKSClientSocketPool() {}
 
 int SOCKSClientSocketPool::RequestSocket(
     const std::string& group_name, const void* socket_params,
@@ -246,10 +239,6 @@
   base_.Flush();
 }
 
-bool SOCKSClientSocketPool::IsStalled() const {
-  return base_.IsStalled() || transport_pool_->IsStalled();
-}
-
 void SOCKSClientSocketPool::CloseIdleSockets() {
   base_.CloseIdleSockets();
 }
@@ -268,14 +257,6 @@
   return base_.GetLoadState(group_name, handle);
 }
 
-void SOCKSClientSocketPool::AddLayeredPool(LayeredPool* layered_pool) {
-  base_.AddLayeredPool(layered_pool);
-}
-
-void SOCKSClientSocketPool::RemoveLayeredPool(LayeredPool* layered_pool) {
-  base_.RemoveLayeredPool(layered_pool);
-}
-
 DictionaryValue* SOCKSClientSocketPool::GetInfoAsValue(
     const std::string& name,
     const std::string& type,
@@ -299,10 +280,4 @@
   return base_.histograms();
 };
 
-bool SOCKSClientSocketPool::CloseOneIdleConnection() {
-  if (base_.CloseOneIdleSocket())
-    return true;
-  return base_.CloseOneIdleConnectionInLayeredPool();
-}
-
 }  // namespace net