| Index: net/url_request/url_request_ftp_job.cc
|
| diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc
|
| index 1c20a578370faf4974e11c9c33e83cef4b369502..cfb63f9743ce5815a78f7216151d327645470322 100644
|
| --- a/net/url_request/url_request_ftp_job.cc
|
| +++ b/net/url_request/url_request_ftp_job.cc
|
| @@ -94,21 +94,21 @@ void URLRequestFtpJob::Start() {
|
| DCHECK(!pac_request_);
|
| DCHECK(!ftp_transaction_);
|
| DCHECK(!http_transaction_);
|
|
|
| int rv = OK;
|
| if (request_->load_flags() & LOAD_BYPASS_PROXY) {
|
| proxy_info_.UseDirect();
|
| } else {
|
| DCHECK_EQ(request_->context()->proxy_service(), proxy_service_);
|
| rv = proxy_service_->ResolveProxy(
|
| - request_->url(), "GET", request_->load_flags(), &proxy_info_,
|
| + request_->url(), "GET", &proxy_info_,
|
| base::Bind(&URLRequestFtpJob::OnResolveProxyComplete,
|
| base::Unretained(this)),
|
| &pac_request_, NULL, request_->net_log());
|
|
|
| if (rv == ERR_IO_PENDING)
|
| return;
|
| }
|
| OnResolveProxyComplete(rv);
|
| }
|
|
|
|
|