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

Side by Side Diff: net/http/http_stream_factory_impl_job.cc

Issue 8373014: Add new text for indicating we are resolving hosts during proxy resolution. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address eroman's nits. Created 9 years, 1 month 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/http/http_stream_factory_impl_job.h" 5 #include "net/http/http_stream_factory_impl_job.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 const AuthCredentials& credentials) { 145 const AuthCredentials& credentials) {
146 DCHECK(establishing_tunnel_); 146 DCHECK(establishing_tunnel_);
147 next_state_ = STATE_RESTART_TUNNEL_AUTH; 147 next_state_ = STATE_RESTART_TUNNEL_AUTH;
148 stream_.reset(); 148 stream_.reset();
149 return RunLoop(OK); 149 return RunLoop(OK);
150 } 150 }
151 151
152 LoadState HttpStreamFactoryImpl::Job::GetLoadState() const { 152 LoadState HttpStreamFactoryImpl::Job::GetLoadState() const {
153 switch (next_state_) { 153 switch (next_state_) {
154 case STATE_RESOLVE_PROXY_COMPLETE: 154 case STATE_RESOLVE_PROXY_COMPLETE:
155 return LOAD_STATE_RESOLVING_PROXY_FOR_URL; 155 return session_->proxy_service()->GetLoadState(pac_request_);
156 case STATE_CREATE_STREAM_COMPLETE: 156 case STATE_CREATE_STREAM_COMPLETE:
157 return connection_->GetLoadState(); 157 return connection_->GetLoadState();
158 case STATE_INIT_CONNECTION_COMPLETE: 158 case STATE_INIT_CONNECTION_COMPLETE:
159 return LOAD_STATE_SENDING_REQUEST; 159 return LOAD_STATE_SENDING_REQUEST;
160 default: 160 default:
161 return LOAD_STATE_IDLE; 161 return LOAD_STATE_IDLE;
162 } 162 }
163 } 163 }
164 164
165 void HttpStreamFactoryImpl::Job::MarkAsAlternate(const GURL& original_url) { 165 void HttpStreamFactoryImpl::Job::MarkAsAlternate(const GURL& original_url) {
(...skipping 978 matching lines...) Expand 10 before | Expand all | Expand 10 after
1144 if (IsPreconnecting() || !request_) { 1144 if (IsPreconnecting() || !request_) {
1145 return false; 1145 return false;
1146 } 1146 }
1147 if (using_ssl_) { 1147 if (using_ssl_) {
1148 return false; 1148 return false;
1149 } 1149 }
1150 return request_info_.method == "GET" || request_info_.method == "HEAD"; 1150 return request_info_.method == "GET" || request_info_.method == "HEAD";
1151 } 1151 }
1152 1152
1153 } // namespace net 1153 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | net/proxy/init_proxy_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698