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

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

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 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
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.h" 5 #include "net/url_request/url_request.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 /////////////////////////////////////////////////////////////////////////////// 558 ///////////////////////////////////////////////////////////////////////////////
559 559
560 URLRequest::URLRequest(const GURL& url, 560 URLRequest::URLRequest(const GURL& url,
561 RequestPriority priority, 561 RequestPriority priority,
562 Delegate* delegate, 562 Delegate* delegate,
563 const URLRequestContext* context, 563 const URLRequestContext* context,
564 NetworkDelegate* network_delegate) 564 NetworkDelegate* network_delegate)
565 : context_(context), 565 : context_(context),
566 network_delegate_(network_delegate ? network_delegate 566 network_delegate_(network_delegate ? network_delegate
567 : context->network_delegate()), 567 : context->network_delegate()),
568 net_log_( 568 net_log_(NetLogWithSource::Make(context->net_log(),
569 BoundNetLog::Make(context->net_log(), NetLogSourceType::URL_REQUEST)), 569 NetLogSourceType::URL_REQUEST)),
570 url_chain_(1, url), 570 url_chain_(1, url),
571 method_("GET"), 571 method_("GET"),
572 referrer_policy_(CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE), 572 referrer_policy_(CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE),
573 first_party_url_policy_(NEVER_CHANGE_FIRST_PARTY_URL), 573 first_party_url_policy_(NEVER_CHANGE_FIRST_PARTY_URL),
574 load_flags_(LOAD_NORMAL), 574 load_flags_(LOAD_NORMAL),
575 delegate_(delegate), 575 delegate_(delegate),
576 status_(URLRequestStatus::FromError(OK)), 576 status_(URLRequestStatus::FromError(OK)),
577 is_pending_(false), 577 is_pending_(false),
578 is_redirecting_(false), 578 is_redirecting_(false),
579 redirect_limit_(kMaxRedirects), 579 redirect_limit_(kMaxRedirects),
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
1233 out->clear(); 1233 out->clear();
1234 } 1234 }
1235 1235
1236 void URLRequest::set_status(URLRequestStatus status) { 1236 void URLRequest::set_status(URLRequestStatus status) {
1237 DCHECK(status_.is_io_pending() || status_.is_success() || 1237 DCHECK(status_.is_io_pending() || status_.is_success() ||
1238 (!status.is_success() && !status.is_io_pending())); 1238 (!status.is_success() && !status.is_io_pending()));
1239 status_ = status; 1239 status_ = status;
1240 } 1240 }
1241 1241
1242 } // namespace net 1242 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698