| Index: net/socket/socks_client_socket_pool.h
|
| diff --git a/net/socket/socks_client_socket_pool.h b/net/socket/socks_client_socket_pool.h
|
| index 3fc7df6831935279b665efafac4bfd0eba5a2ce0..8583d96fecab71567abe36a376177c1e9e549631 100644
|
| --- a/net/socket/socks_client_socket_pool.h
|
| +++ b/net/socket/socks_client_socket_pool.h
|
| @@ -105,7 +105,8 @@ class SOCKSConnectJob : public ConnectJob {
|
| DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJob);
|
| };
|
|
|
| -class NET_EXPORT_PRIVATE SOCKSClientSocketPool : public ClientSocketPool {
|
| +class NET_EXPORT_PRIVATE SOCKSClientSocketPool
|
| + : public ClientSocketPool, public LayeredPool {
|
| public:
|
| SOCKSClientSocketPool(
|
| int max_sockets,
|
| @@ -139,6 +140,8 @@ class NET_EXPORT_PRIVATE SOCKSClientSocketPool : public ClientSocketPool {
|
|
|
| virtual void Flush() OVERRIDE;
|
|
|
| + virtual bool IsStalled() const OVERRIDE;
|
| +
|
| virtual void CloseIdleSockets() OVERRIDE;
|
|
|
| virtual int IdleSocketCount() const OVERRIDE;
|
| @@ -150,6 +153,10 @@ class NET_EXPORT_PRIVATE SOCKSClientSocketPool : public ClientSocketPool {
|
| 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,
|
| @@ -159,6 +166,9 @@ class NET_EXPORT_PRIVATE SOCKSClientSocketPool : public ClientSocketPool {
|
|
|
| virtual ClientSocketPoolHistograms* histograms() const OVERRIDE;
|
|
|
| + // LayeredPool implementation.
|
| + virtual bool CloseOneIdleConnection() OVERRIDE;
|
| +
|
| private:
|
| typedef ClientSocketPoolBase<SOCKSSocketParams> PoolBase;
|
|
|
|
|