Index: net/http/http_proxy_client_socket_pool.h |
diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h |
index 6fe83ddfd4f01b27cfdbf12e955eec5f0abc7386..31d21cb73c8600876d05351da51840c7a8610a55 100644 |
--- a/net/http/http_proxy_client_socket_pool.h |
+++ b/net/http/http_proxy_client_socket_pool.h |
@@ -167,7 +167,8 @@ class HttpProxyConnectJob : public ConnectJob { |
DISALLOW_COPY_AND_ASSIGN(HttpProxyConnectJob); |
}; |
-class NET_EXPORT_PRIVATE HttpProxyClientSocketPool : public ClientSocketPool { |
+class NET_EXPORT_PRIVATE HttpProxyClientSocketPool |
+ : public ClientSocketPool, public LayeredPool { |
public: |
HttpProxyClientSocketPool( |
int max_sockets, |
@@ -202,6 +203,8 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool : public ClientSocketPool { |
virtual void Flush() OVERRIDE; |
+ virtual bool IsStalled() const OVERRIDE; |
+ |
virtual void CloseIdleSockets() OVERRIDE; |
virtual int IdleSocketCount() const OVERRIDE; |
@@ -213,6 +216,10 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool : 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, |
@@ -222,6 +229,9 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool : public ClientSocketPool { |
virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; |
+ // LayeredPool methods: |
+ virtual bool CloseOneIdleConnection() OVERRIDE; |
+ |
private: |
typedef ClientSocketPoolBase<HttpProxySocketParams> PoolBase; |