Chromium Code Reviews| 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 9d8dd49087bee1ee46d0eb7825e2a33e9b2a9556..bc65c1e1c18889d0b8a1f870267d83c70198cf06 100644 |
| --- a/net/url_request/url_request_ftp_job.cc |
| +++ b/net/url_request/url_request_ftp_job.cc |
| @@ -94,28 +94,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(), |
|
mmenke
2016/03/02 22:53:45
Methods are meaningless for FTP requests. Should
RyanSturm
2016/03/03 18:54:31
Done.
|
| + &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_); |