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

net/socket/client_socket_handle.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_SOCKET_CLIENT_SOCKET_HANDLE_H_
 #define NET_SOCKET_CLIENT_SOCKET_HANDLE_H_
 #pragma once
 
 #include <string>
 
@@ skipping 74 matching lines @@
   //
   // NOTE: To prevent the socket from being kept alive, be sure to call its
   // Disconnect method.  This will result in the ClientSocketPool deleting the
   // StreamSocket.
   void Reset();
 
   // Used after Init() is called, but before the ClientSocketPool has
   // initialized the ClientSocketHandle.
   LoadState GetLoadState() const;
 
-  bool IsPoolStalled() const;
-
-  void AddLayeredPool(LayeredPool* layered_pool);
-
   // Returns true when Init() has completed successfully.
   bool is_initialized() const { return is_initialized_; }
 
   // Returns the time tick when Init() was called.
   base::TimeTicks init_time() const { return init_time_; }
 
   // Returns the time between Init() and when is_initialized() becomes true.
   base::TimeDelta setup_time() const { return setup_time_; }
 
   // Used by ClientSocketPool to initialize the ClientSocketHandle.
@@ skipping 52 matching lines @@
   // Resets the state of the ClientSocketHandle.  |cancel| indicates whether or
   // not to try to cancel the request with the ClientSocketPool.  Does not
   // reset the supplemental error state.
   void ResetInternal(bool cancel);
 
   // Resets the supplemental error state.
   void ResetErrorState();
 
   bool is_initialized_;
   ClientSocketPool* pool_;
-  LayeredPool* layered_pool_;
   scoped_ptr<StreamSocket> socket_;
   std::string group_name_;
   bool is_reused_;
   CompletionCallback callback_;
   CompletionCallback user_callback_;
   base::TimeDelta idle_time_;
   int pool_id_;  // See ClientSocketPool::ReleaseSocket() for an explanation.
   bool is_ssl_error_;
   HttpResponseInfo ssl_error_response_info_;
   scoped_ptr<ClientSocketHandle> pending_http_proxy_connection_;
@@ skipping 31 matching lines @@
     user_callback_ = callback;
   } else {
     HandleInitCompletion(rv);
   }
   return rv;
 }
 
 }  // namespace net
 
 #endif  // NET_SOCKET_CLIENT_SOCKET_HANDLE_H_