| 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 fd59e45e9f40727592811951ed80623368a2f608..91f21aec36127fd46d7b41e341ee1d11fdf480f2 100644
|
| --- a/net/url_request/url_request_ftp_job.cc
|
| +++ b/net/url_request/url_request_ftp_job.cc
|
| @@ -95,28 +95,24 @@ 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(),
|
| - request_->load_flags(),
|
| - &proxy_info_,
|
| - base::Bind(&URLRequestFtpJob::OnResolveProxyComplete,
|
| - base::Unretained(this)),
|
| - &pac_request_,
|
| - NULL,
|
| - request_->net_log());
|
| + request_->url(), request_->method(), request_->load_flags(),
|
| + &proxy_info_, base::Bind(&URLRequestFtpJob::OnResolveProxyComplete,
|
| + base::Unretained(this)),
|
| + &pac_request_, NULL, request_->net_log());
|
|
|
| if (rv == ERR_IO_PENDING)
|
| return;
|
| }
|
| OnResolveProxyComplete(rv);
|
| }
|
|
|
| void URLRequestFtpJob::Kill() {
|
| if (pac_request_) {
|
| proxy_service_->CancelPacRequest(pac_request_);
|
|
|