| Index: net/socket/socks_client_socket_pool.cc
|
| diff --git a/net/socket/socks_client_socket_pool.cc b/net/socket/socks_client_socket_pool.cc
|
| index e11b7a48db5b6f8e8ed21823d2afdd718a473c8d..ee613ac457943d4478a0f76d055e7bda6cb88309 100644
|
| --- a/net/socket/socks_client_socket_pool.cc
|
| +++ b/net/socket/socks_client_socket_pool.cc
|
| @@ -192,17 +192,17 @@ SOCKSClientSocketPool::SOCKSConnectJobFactory::ConnectionTimeout() const {
|
| SOCKSClientSocketPool::SOCKSClientSocketPool(
|
| int max_sockets,
|
| int max_sockets_per_group,
|
| - ClientSocketPoolHistograms* histograms,
|
| HostResolver* host_resolver,
|
| TransportClientSocketPool* transport_pool,
|
| NetLog* net_log)
|
| : transport_pool_(transport_pool),
|
| - base_(this, max_sockets, max_sockets_per_group, histograms,
|
| - ClientSocketPool::unused_idle_socket_timeout(),
|
| - ClientSocketPool::used_idle_socket_timeout(),
|
| - new SOCKSConnectJobFactory(transport_pool,
|
| - host_resolver,
|
| - net_log)) {
|
| + base_(
|
| + this,
|
| + max_sockets,
|
| + max_sockets_per_group,
|
| + ClientSocketPool::unused_idle_socket_timeout(),
|
| + ClientSocketPool::used_idle_socket_timeout(),
|
| + new SOCKSConnectJobFactory(transport_pool, host_resolver, net_log)) {
|
| // We should always have a |transport_pool_| except in unit tests.
|
| if (transport_pool_)
|
| base_.AddLowerLayeredPool(transport_pool_);
|
| @@ -285,10 +285,6 @@ base::TimeDelta SOCKSClientSocketPool::ConnectionTimeout() const {
|
| return base_.ConnectionTimeout();
|
| }
|
|
|
| -ClientSocketPoolHistograms* SOCKSClientSocketPool::histograms() const {
|
| - return base_.histograms();
|
| -};
|
| -
|
| bool SOCKSClientSocketPool::IsStalled() const {
|
| return base_.IsStalled();
|
| }
|
|
|