| 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 483520b0c1a8887c2fb88071569f8239a032b0d3..1bebdda3a47ca36262995fcf1dfe6af3dc42fe0d 100644
|
| --- a/net/http/http_proxy_client_socket_pool.h
|
| +++ b/net/http/http_proxy_client_socket_pool.h
|
| @@ -170,7 +170,9 @@ 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,
|
| @@ -205,6 +207,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;
|
| @@ -216,6 +220,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,
|
| @@ -225,6 +233,9 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool : public ClientSocketPool {
|
|
|
| virtual ClientSocketPoolHistograms* histograms() const OVERRIDE;
|
|
|
| + // LayeredPool implementation.
|
| + virtual bool CloseOneIdleConnection() OVERRIDE;
|
| +
|
| private:
|
| typedef ClientSocketPoolBase<HttpProxySocketParams> PoolBase;
|
|
|
|
|