| 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 f6a83eff86b7489c79d29e77d06642a408617b4f..867131ce47ab605758005a6a2700e3a3324903d3 100644
|
| --- a/net/http/http_proxy_client_socket_pool.h
|
| +++ b/net/http/http_proxy_client_socket_pool.h
|
| @@ -252,9 +252,7 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool
|
| const PoolBase::Request& request,
|
| ConnectJob::Delegate* delegate) const OVERRIDE;
|
|
|
| - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE {
|
| - return timeout_;
|
| - }
|
| + virtual base::TimeDelta ConnectionTimeout() const OVERRIDE;
|
|
|
| private:
|
| TransportClientSocketPool* const transport_pool_;
|
|
|