| 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 a26c05f6603c9fbd1590eeac54682e8a830dbded..ad701b57f7b1c90a7ca115b60b300d1a4dc96914 100644
|
| --- a/net/http/http_proxy_client_socket_pool.h
|
| +++ b/net/http/http_proxy_client_socket_pool.h
|
| @@ -66,9 +66,7 @@ class NET_EXPORT_PRIVATE HttpProxySocketParams
|
| HttpAuthHandlerFactory* http_auth_handler_factory() const {
|
| return http_auth_handler_factory_;
|
| }
|
| - SpdySessionPool* spdy_session_pool() {
|
| - return spdy_session_pool_;
|
| - }
|
| + SpdySessionPool* spdy_session_pool() { return spdy_session_pool_; }
|
| const HostResolver::RequestInfo& destination() const;
|
| bool tunnel() const { return tunnel_; }
|
| bool ignore_limits() const { return ignore_limits_; }
|
| @@ -173,20 +171,18 @@ class HttpProxyConnectJob : public ConnectJob {
|
| DISALLOW_COPY_AND_ASSIGN(HttpProxyConnectJob);
|
| };
|
|
|
| -class NET_EXPORT_PRIVATE HttpProxyClientSocketPool
|
| - : public ClientSocketPool,
|
| - public HigherLayeredPool {
|
| +class NET_EXPORT_PRIVATE HttpProxyClientSocketPool : public ClientSocketPool,
|
| + public HigherLayeredPool {
|
| public:
|
| typedef HttpProxySocketParams SocketParams;
|
|
|
| - HttpProxyClientSocketPool(
|
| - int max_sockets,
|
| - int max_sockets_per_group,
|
| - ClientSocketPoolHistograms* histograms,
|
| - HostResolver* host_resolver,
|
| - TransportClientSocketPool* transport_pool,
|
| - SSLClientSocketPool* ssl_pool,
|
| - NetLog* net_log);
|
| + HttpProxyClientSocketPool(int max_sockets,
|
| + int max_sockets_per_group,
|
| + ClientSocketPoolHistograms* histograms,
|
| + HostResolver* host_resolver,
|
| + TransportClientSocketPool* transport_pool,
|
| + SSLClientSocketPool* ssl_pool,
|
| + NetLog* net_log);
|
|
|
| virtual ~HttpProxyClientSocketPool();
|
|
|
| @@ -247,11 +243,10 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool
|
|
|
| class HttpProxyConnectJobFactory : public PoolBase::ConnectJobFactory {
|
| public:
|
| - HttpProxyConnectJobFactory(
|
| - TransportClientSocketPool* transport_pool,
|
| - SSLClientSocketPool* ssl_pool,
|
| - HostResolver* host_resolver,
|
| - NetLog* net_log);
|
| + HttpProxyConnectJobFactory(TransportClientSocketPool* transport_pool,
|
| + SSLClientSocketPool* ssl_pool,
|
| + HostResolver* host_resolver,
|
| + NetLog* net_log);
|
|
|
| // ClientSocketPoolBase::ConnectJobFactory methods.
|
| virtual scoped_ptr<ConnectJob> NewConnectJob(
|
|
|