| 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 68a466b7bda88be7624bbe5817574cdd72c7db37..09da943d1e943967757b70178e08901e45f86600 100644
|
| --- a/net/http/http_proxy_client_socket_pool.h
|
| +++ b/net/http/http_proxy_client_socket_pool.h
|
| @@ -156,7 +156,6 @@ class HttpProxyConnectJob : public ConnectJob {
|
|
|
| State next_state_;
|
| CompletionCallback callback_;
|
| - OldCompletionCallbackImpl<HttpProxyConnectJob> callback_old_;
|
| scoped_ptr<ClientSocketHandle> transport_socket_handle_;
|
| scoped_ptr<ProxyClientSocket> transport_socket_;
|
| bool using_spdy_;
|
| @@ -169,7 +168,8 @@ class HttpProxyConnectJob : public ConnectJob {
|
| };
|
|
|
| class NET_EXPORT_PRIVATE HttpProxyClientSocketPool
|
| - : public ClientSocketPool, public LayeredPool {
|
| + : public ClientSocketPool,
|
| + public LayeredPool {
|
| public:
|
| HttpProxyClientSocketPool(
|
| int max_sockets,
|
| @@ -182,12 +182,12 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool
|
|
|
| virtual ~HttpProxyClientSocketPool();
|
|
|
| - // ClientSocketPool methods:
|
| + // ClientSocketPool implementation.
|
| virtual int RequestSocket(const std::string& group_name,
|
| const void* connect_params,
|
| RequestPriority priority,
|
| ClientSocketHandle* handle,
|
| - OldCompletionCallback* callback,
|
| + const CompletionCallback& callback,
|
| const BoundNetLog& net_log) OVERRIDE;
|
|
|
| virtual void RequestSockets(const std::string& group_name,
|
| @@ -230,7 +230,7 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool
|
|
|
| virtual ClientSocketPoolHistograms* histograms() const OVERRIDE;
|
|
|
| - // LayeredPool methods:
|
| + // LayeredPool implementation.
|
| virtual bool CloseOneIdleConnection() OVERRIDE;
|
|
|
| private:
|
|
|