| 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 66897d219e1db66c4dc39ece1c4b0f14acf8f0e3..22aa523d1a20f1b19d61166c659a46ef7cd38376 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,
|
| @@ -186,39 +187,50 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool : public ClientSocketPool {
|
| RequestPriority priority,
|
| ClientSocketHandle* handle,
|
| OldCompletionCallback* callback,
|
| - const BoundNetLog& net_log);
|
| + const BoundNetLog& net_log) OVERRIDE;
|
|
|
| virtual void RequestSockets(const std::string& group_name,
|
| const void* params,
|
| int num_sockets,
|
| - const BoundNetLog& net_log);
|
| + const BoundNetLog& net_log) OVERRIDE;
|
|
|
| virtual void CancelRequest(const std::string& group_name,
|
| - ClientSocketHandle* handle);
|
| + ClientSocketHandle* handle) OVERRIDE;
|
|
|
| virtual void ReleaseSocket(const std::string& group_name,
|
| StreamSocket* socket,
|
| - int id);
|
| + int id) OVERRIDE;
|
|
|
| - virtual void Flush();
|
| + virtual void Flush() OVERRIDE;
|
|
|
| - virtual void CloseIdleSockets();
|
| + virtual bool IsStalled() const OVERRIDE;
|
|
|
| - virtual int IdleSocketCount() const;
|
| + virtual void CloseIdleSockets() OVERRIDE;
|
|
|
| - virtual int IdleSocketCountInGroup(const std::string& group_name) const;
|
| + virtual int IdleSocketCount() const OVERRIDE;
|
|
|
| - virtual LoadState GetLoadState(const std::string& group_name,
|
| - const ClientSocketHandle* handle) const;
|
| + virtual int IdleSocketCountInGroup(
|
| + const std::string& group_name) const OVERRIDE;
|
| +
|
| + virtual LoadState GetLoadState(
|
| + 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,
|
| - bool include_nested_pools) const;
|
| + bool include_nested_pools) const OVERRIDE;
|
| +
|
| + virtual base::TimeDelta ConnectionTimeout() const OVERRIDE;
|
|
|
| - virtual base::TimeDelta ConnectionTimeout() const;
|
| + virtual ClientSocketPoolHistograms* histograms() const OVERRIDE;
|
|
|
| - virtual ClientSocketPoolHistograms* histograms() const;
|
| + // LayeredPool methods:
|
| + virtual bool CloseOneIdleConnection() OVERRIDE;
|
|
|
| private:
|
| typedef ClientSocketPoolBase<HttpProxySocketParams> PoolBase;
|
|
|