| 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..d2d51c1f8336abb2b6fafe3dd4b763c5a34cf0f1 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) {
|
|
|