| Index: net/socket/socks_client_socket_pool.h
|
| ===================================================================
|
| --- net/socket/socks_client_socket_pool.h (revision 211652)
|
| +++ net/socket/socks_client_socket_pool.h (working copy)
|
| @@ -105,7 +105,7 @@
|
| };
|
|
|
| class NET_EXPORT_PRIVATE SOCKSClientSocketPool
|
| - : public ClientSocketPool, public LayeredPool {
|
| + : public ClientSocketPool, public HigherLayeredPool {
|
| public:
|
| SOCKSClientSocketPool(
|
| int max_sockets,
|
| @@ -139,8 +139,6 @@
|
|
|
| virtual void FlushWithError(int error) OVERRIDE;
|
|
|
| - virtual bool IsStalled() const OVERRIDE;
|
| -
|
| virtual void CloseIdleSockets() OVERRIDE;
|
|
|
| virtual int IdleSocketCount() const OVERRIDE;
|
| @@ -152,10 +150,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,
|
| @@ -165,7 +159,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:
|
|
|