| Index: net/socket/socks_client_socket_pool.h
|
| diff --git a/net/socket/socks_client_socket_pool.h b/net/socket/socks_client_socket_pool.h
|
| index c6d5c8d0883589826ee738a11418473f950a7fa6..2d0b0279d9dea104d758a68249b313e06b378a2f 100644
|
| --- a/net/socket/socks_client_socket_pool.h
|
| +++ b/net/socket/socks_client_socket_pool.h
|
| @@ -28,7 +28,8 @@ class NET_EXPORT_PRIVATE SOCKSSocketParams
|
| : public base::RefCounted<SOCKSSocketParams> {
|
| public:
|
| SOCKSSocketParams(const scoped_refptr<TransportSocketParams>& proxy_server,
|
| - bool socks_v5, const HostPortPair& host_port_pair);
|
| + bool socks_v5,
|
| + const HostPortPair& host_port_pair);
|
|
|
| const scoped_refptr<TransportSocketParams>& transport_params() const {
|
| return transport_params_;
|
| @@ -104,18 +105,17 @@ class SOCKSConnectJob : public ConnectJob {
|
| DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJob);
|
| };
|
|
|
| -class NET_EXPORT_PRIVATE SOCKSClientSocketPool
|
| - : public ClientSocketPool, public HigherLayeredPool {
|
| +class NET_EXPORT_PRIVATE SOCKSClientSocketPool : public ClientSocketPool,
|
| + public HigherLayeredPool {
|
| public:
|
| typedef SOCKSSocketParams SocketParams;
|
|
|
| - SOCKSClientSocketPool(
|
| - int max_sockets,
|
| - int max_sockets_per_group,
|
| - ClientSocketPoolHistograms* histograms,
|
| - HostResolver* host_resolver,
|
| - TransportClientSocketPool* transport_pool,
|
| - NetLog* net_log);
|
| + SOCKSClientSocketPool(int max_sockets,
|
| + int max_sockets_per_group,
|
| + ClientSocketPoolHistograms* histograms,
|
| + HostResolver* host_resolver,
|
| + TransportClientSocketPool* transport_pool,
|
| + NetLog* net_log);
|
|
|
| virtual ~SOCKSClientSocketPool();
|
|
|
|
|