| Index: net/http/http_stream_factory_impl_job.cc
|
| diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
|
| index 79a95361d43f001ea33018d61eb1cb3f104e4c09..9396535c8fc148ddd4442d315139d95fd0219008 100644
|
| --- a/net/http/http_stream_factory_impl_job.cc
|
| +++ b/net/http/http_stream_factory_impl_job.cc
|
| @@ -652,6 +652,7 @@ int HttpStreamFactoryImpl::Job::DoStart() {
|
|
|
| int HttpStreamFactoryImpl::Job::DoResolveProxy() {
|
| DCHECK(!pac_request_);
|
| + DCHECK(session_);
|
|
|
| next_state_ = STATE_RESOLVE_PROXY_COMPLETE;
|
|
|
| @@ -661,7 +662,8 @@ int HttpStreamFactoryImpl::Job::DoResolveProxy() {
|
| }
|
|
|
| return session_->proxy_service()->ResolveProxy(
|
| - request_info_.url, &proxy_info_, io_callback_, &pac_request_, net_log_);
|
| + request_info_.url, request_info_.load_flags, &proxy_info_, io_callback_,
|
| + &pac_request_, session_->network_delegate(), net_log_);
|
| }
|
|
|
| int HttpStreamFactoryImpl::Job::DoResolveProxyComplete(int result) {
|
| @@ -1268,6 +1270,7 @@ void HttpStreamFactoryImpl::Job::InitSSLConfig(
|
|
|
| int HttpStreamFactoryImpl::Job::ReconsiderProxyAfterError(int error) {
|
| DCHECK(!pac_request_);
|
| + DCHECK(session_);
|
|
|
| // A failure to resolve the hostname or any error related to establishing a
|
| // TCP connection could be grounds for trying a new proxy configuration.
|
| @@ -1321,8 +1324,8 @@ int HttpStreamFactoryImpl::Job::ReconsiderProxyAfterError(int error) {
|
| }
|
|
|
| int rv = session_->proxy_service()->ReconsiderProxyAfterError(
|
| - request_info_.url, error, &proxy_info_, io_callback_, &pac_request_,
|
| - net_log_);
|
| + request_info_.url, request_info_.load_flags, error, &proxy_info_,
|
| + io_callback_, &pac_request_, session_->network_delegate(), net_log_);
|
| if (rv == OK || rv == ERR_IO_PENDING) {
|
| // If the error was during connection setup, there is no socket to
|
| // disconnect.
|
|
|