Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Side by Side Diff: net/url_request/url_request_ftp_job.cc

Issue 2110973002: Removing load_flags from ProxyService and ProxyDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/proxy/proxy_service_unittest.cc ('k') | net/websockets/websocket_end_to_end_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/url_request/url_request_ftp_job.h" 5 #include "net/url_request/url_request_ftp_job.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 DCHECK(!pac_request_); 94 DCHECK(!pac_request_);
95 DCHECK(!ftp_transaction_); 95 DCHECK(!ftp_transaction_);
96 DCHECK(!http_transaction_); 96 DCHECK(!http_transaction_);
97 97
98 int rv = OK; 98 int rv = OK;
99 if (request_->load_flags() & LOAD_BYPASS_PROXY) { 99 if (request_->load_flags() & LOAD_BYPASS_PROXY) {
100 proxy_info_.UseDirect(); 100 proxy_info_.UseDirect();
101 } else { 101 } else {
102 DCHECK_EQ(request_->context()->proxy_service(), proxy_service_); 102 DCHECK_EQ(request_->context()->proxy_service(), proxy_service_);
103 rv = proxy_service_->ResolveProxy( 103 rv = proxy_service_->ResolveProxy(
104 request_->url(), "GET", request_->load_flags(), &proxy_info_, 104 request_->url(), "GET", &proxy_info_,
105 base::Bind(&URLRequestFtpJob::OnResolveProxyComplete, 105 base::Bind(&URLRequestFtpJob::OnResolveProxyComplete,
106 base::Unretained(this)), 106 base::Unretained(this)),
107 &pac_request_, NULL, request_->net_log()); 107 &pac_request_, NULL, request_->net_log());
108 108
109 if (rv == ERR_IO_PENDING) 109 if (rv == ERR_IO_PENDING)
110 return; 110 return;
111 } 111 }
112 OnResolveProxyComplete(rv); 112 OnResolveProxyComplete(rv);
113 } 113 }
114 114
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 if (cached_auth) { 372 if (cached_auth) {
373 // Retry using cached auth data. 373 // Retry using cached auth data.
374 SetAuth(cached_auth->credentials); 374 SetAuth(cached_auth->credentials);
375 } else { 375 } else {
376 // Prompt for a username/password. 376 // Prompt for a username/password.
377 NotifyHeadersComplete(); 377 NotifyHeadersComplete();
378 } 378 }
379 } 379 }
380 380
381 } // namespace net 381 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_service_unittest.cc ('k') | net/websockets/websocket_end_to_end_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698