| Index: net/socket/socks_client_socket_pool.h | 
| =================================================================== | 
| --- net/socket/socks_client_socket_pool.h	(revision 219027) | 
| +++ net/socket/socks_client_socket_pool.h	(working copy) | 
| @@ -107,7 +107,7 @@ | 
| }; | 
|  | 
| class NET_EXPORT_PRIVATE SOCKSClientSocketPool | 
| -    : public ClientSocketPool, public LayeredPool { | 
| +    : public ClientSocketPool, public HigherLayeredPool { | 
| public: | 
| typedef SOCKSSocketParams SocketParams; | 
|  | 
| @@ -143,8 +143,6 @@ | 
|  | 
| virtual void FlushWithError(int error) OVERRIDE; | 
|  | 
| -  virtual bool IsStalled() const OVERRIDE; | 
| - | 
| virtual void CloseIdleSockets() OVERRIDE; | 
|  | 
| virtual int IdleSocketCount() const OVERRIDE; | 
| @@ -156,10 +154,6 @@ | 
| const std::string& group_name, | 
| const ClientSocketHandle* handle) const OVERRIDE; | 
|  | 
| -  virtual void AddLayeredPool(LayeredPool* layered_pool) OVERRIDE; | 
| - | 
| -  virtual void RemoveLayeredPool(LayeredPool* layered_pool) OVERRIDE; | 
| - | 
| virtual base::DictionaryValue* GetInfoAsValue( | 
| const std::string& name, | 
| const std::string& type, | 
| @@ -169,7 +163,14 @@ | 
|  | 
| virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; | 
|  | 
| -  // LayeredPool implementation. | 
| +  // LowerLayeredPool implementation. | 
| +  virtual bool IsStalled() const OVERRIDE; | 
| + | 
| +  virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; | 
| + | 
| +  virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; | 
| + | 
| +  // HigherLayeredPool implementation. | 
| virtual bool CloseOneIdleConnection() OVERRIDE; | 
|  | 
| private: | 
|  |