| Index: net/http/http_proxy_client_socket_pool.h | 
| =================================================================== | 
| --- net/http/http_proxy_client_socket_pool.h	(revision 219027) | 
| +++ net/http/http_proxy_client_socket_pool.h	(working copy) | 
| @@ -175,7 +175,7 @@ | 
|  | 
| class NET_EXPORT_PRIVATE HttpProxyClientSocketPool | 
| : public ClientSocketPool, | 
| -      public LayeredPool { | 
| +      public HigherLayeredPool { | 
| public: | 
| typedef HttpProxySocketParams SocketParams; | 
|  | 
| @@ -212,8 +212,6 @@ | 
|  | 
| virtual void FlushWithError(int error) OVERRIDE; | 
|  | 
| -  virtual bool IsStalled() const OVERRIDE; | 
| - | 
| virtual void CloseIdleSockets() OVERRIDE; | 
|  | 
| virtual int IdleSocketCount() const OVERRIDE; | 
| @@ -225,10 +223,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, | 
| @@ -238,7 +232,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: | 
|  |