Index: net/socket/socks_client_socket_pool.h |
=================================================================== |
--- net/socket/socks_client_socket_pool.h (revision 112133) |
+++ net/socket/socks_client_socket_pool.h (working copy) |
@@ -105,8 +105,7 @@ |
DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJob); |
}; |
-class NET_EXPORT_PRIVATE SOCKSClientSocketPool |
- : public ClientSocketPool, public LayeredPool { |
+class NET_EXPORT_PRIVATE SOCKSClientSocketPool : public ClientSocketPool { |
public: |
SOCKSClientSocketPool( |
int max_sockets, |
@@ -140,8 +139,6 @@ |
virtual void Flush() OVERRIDE; |
- virtual bool IsStalled() const OVERRIDE; |
- |
virtual void CloseIdleSockets() OVERRIDE; |
virtual int IdleSocketCount() const OVERRIDE; |
@@ -153,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, |
@@ -166,9 +159,6 @@ |
virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; |
- // LayeredPool methods: |
- virtual bool CloseOneIdleConnection() OVERRIDE; |
- |
private: |
typedef ClientSocketPoolBase<SOCKSSocketParams> PoolBase; |