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

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

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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
« no previous file with comments | « net/url_request/url_request_file_job.cc ('k') | net/url_request/url_request_simple_job.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_job.h" 5 #include "net/url_request/url_request_job.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/power_monitor/power_monitor.h" 10 #include "base/power_monitor/power_monitor.h"
11 #include "base/profiler/scoped_profile.h" 11 #include "base/profiler/scoped_tracker.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "net/base/auth.h" 14 #include "net/base/auth.h"
15 #include "net/base/host_port_pair.h" 15 #include "net/base/host_port_pair.h"
16 #include "net/base/io_buffer.h" 16 #include "net/base/io_buffer.h"
17 #include "net/base/load_states.h" 17 #include "net/base/load_states.h"
18 #include "net/base/net_errors.h" 18 #include "net/base/net_errors.h"
19 #include "net/base/network_delegate.h" 19 #include "net/base/network_delegate.h"
20 #include "net/filter/filter.h" 20 #include "net/filter/filter.h"
21 #include "net/http/http_response_headers.h" 21 #include "net/http/http_response_headers.h"
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 } 293 }
294 294
295 void URLRequestJob::NotifyBeforeNetworkStart(bool* defer) { 295 void URLRequestJob::NotifyBeforeNetworkStart(bool* defer) {
296 if (!request_) 296 if (!request_)
297 return; 297 return;
298 298
299 request_->NotifyBeforeNetworkStart(defer); 299 request_->NotifyBeforeNetworkStart(defer);
300 } 300 }
301 301
302 void URLRequestJob::NotifyHeadersComplete() { 302 void URLRequestJob::NotifyHeadersComplete() {
303 // TODO(vadimt): Remove ScopedProfile below once crbug.com/423948 is fixed. 303 // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
304 tracked_objects::ScopedProfile tracking_profile( 304 tracked_objects::ScopedTracker tracking_profile(
305 FROM_HERE_WITH_EXPLICIT_FUNCTION( 305 FROM_HERE_WITH_EXPLICIT_FUNCTION(
306 "423948 URLRequestJob::NotifyHeadersComplete")); 306 "423948 URLRequestJob::NotifyHeadersComplete"));
307 307
308 if (!request_ || !request_->has_delegate()) 308 if (!request_ || !request_->has_delegate())
309 return; // The request was destroyed, so there is no more work to do. 309 return; // The request was destroyed, so there is no more work to do.
310 310
311 if (has_handled_response_) 311 if (has_handled_response_)
312 return; 312 return;
313 313
314 DCHECK(!request_->status().is_io_pending()); 314 DCHECK(!request_->status().is_io_pending());
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
801 !redirect_info.new_url.SchemeIsSecure()) { 801 !redirect_info.new_url.SchemeIsSecure()) {
802 redirect_info.new_referrer.clear(); 802 redirect_info.new_referrer.clear();
803 } else { 803 } else {
804 redirect_info.new_referrer = request_->referrer(); 804 redirect_info.new_referrer = request_->referrer();
805 } 805 }
806 806
807 return redirect_info; 807 return redirect_info;
808 } 808 }
809 809
810 } // namespace net 810 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_file_job.cc ('k') | net/url_request/url_request_simple_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698