| Index: net/http/http_proxy_client_socket_wrapper.cc
|
| diff --git a/net/http/http_proxy_client_socket_wrapper.cc b/net/http/http_proxy_client_socket_wrapper.cc
|
| index 1a56a5c488f3e10521de86112eff62ae1efe5377..d1595187d340c9a2378c2ca31a862bca9d3047f6 100644
|
| --- a/net/http/http_proxy_client_socket_wrapper.cc
|
| +++ b/net/http/http_proxy_client_socket_wrapper.cc
|
| @@ -29,6 +29,7 @@ namespace net {
|
| HttpProxyClientSocketWrapper::HttpProxyClientSocketWrapper(
|
| const std::string& group_name,
|
| RequestPriority priority,
|
| + ClientSocketPool::RespectLimits respect_limits,
|
| base::TimeDelta connect_timeout_duration,
|
| base::TimeDelta proxy_negotiation_timeout_duration,
|
| TransportClientSocketPool* transport_pool,
|
| @@ -46,6 +47,7 @@ HttpProxyClientSocketWrapper::HttpProxyClientSocketWrapper(
|
| : next_state_(STATE_NONE),
|
| group_name_(group_name),
|
| priority_(priority),
|
| + respect_limits_(respect_limits),
|
| connect_timeout_duration_(connect_timeout_duration),
|
| proxy_negotiation_timeout_duration_(proxy_negotiation_timeout_duration),
|
| transport_pool_(transport_pool),
|
| @@ -404,7 +406,7 @@ int HttpProxyClientSocketWrapper::DoTransportConnect() {
|
| next_state_ = STATE_TCP_CONNECT_COMPLETE;
|
| transport_socket_handle_.reset(new ClientSocketHandle());
|
| return transport_socket_handle_->Init(
|
| - group_name_, transport_params_, priority_,
|
| + group_name_, transport_params_, priority_, respect_limits_,
|
| base::Bind(&HttpProxyClientSocketWrapper::OnIOComplete,
|
| base::Unretained(this)),
|
| transport_pool_, net_log_);
|
| @@ -436,7 +438,7 @@ int HttpProxyClientSocketWrapper::DoSSLConnect() {
|
| next_state_ = STATE_SSL_CONNECT_COMPLETE;
|
| transport_socket_handle_.reset(new ClientSocketHandle());
|
| return transport_socket_handle_->Init(
|
| - group_name_, ssl_params_, priority_,
|
| + group_name_, ssl_params_, priority_, respect_limits_,
|
| base::Bind(&HttpProxyClientSocketWrapper::OnIOComplete,
|
| base::Unretained(this)),
|
| ssl_pool_, net_log_);
|
| @@ -587,7 +589,7 @@ int HttpProxyClientSocketWrapper::DoRestartWithAuthComplete(int result) {
|
| // TODO(mmenke): This may still result in waiting in line, if there are
|
| // other HIGHEST priority requests. Consider a workaround for
|
| // that. Starting the new request before releasing the old
|
| - // socket and using LOAD_IGNORE_LIMITS would do the trick,
|
| + // socket and using RespectLimits::Disabled would work,
|
| // without exceding the the socket pool limits (Since the old
|
| // socket would free up the extra socket slot when destroyed).
|
| priority_ = HIGHEST;
|
|
|