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

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

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 2 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/http/http_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 stream->Drain(session_); 121 stream->Drain(session_);
122 } 122 }
123 } 123 }
124 124
125 if (request_ && request_->upload_data_stream) 125 if (request_ && request_->upload_data_stream)
126 request_->upload_data_stream->Reset(); // Invalidate pending callbacks. 126 request_->upload_data_stream->Reset(); // Invalidate pending callbacks.
127 } 127 }
128 128
129 int HttpNetworkTransaction::Start(const HttpRequestInfo* request_info, 129 int HttpNetworkTransaction::Start(const HttpRequestInfo* request_info,
130 const CompletionCallback& callback, 130 const CompletionCallback& callback,
131 const BoundNetLog& net_log) { 131 const NetLogWithSource& net_log) {
132 net_log_ = net_log; 132 net_log_ = net_log;
133 request_ = request_info; 133 request_ = request_info;
134 134
135 // Now that we have an HttpRequestInfo object, update server_ssl_config_. 135 // Now that we have an HttpRequestInfo object, update server_ssl_config_.
136 session_->GetSSLConfig(*request_, &server_ssl_config_, &proxy_ssl_config_); 136 session_->GetSSLConfig(*request_, &server_ssl_config_, &proxy_ssl_config_);
137 137
138 if (request_->load_flags & LOAD_DISABLE_CERT_REVOCATION_CHECKING) { 138 if (request_->load_flags & LOAD_DISABLE_CERT_REVOCATION_CHECKING) {
139 server_ssl_config_.rev_checking_enabled = false; 139 server_ssl_config_.rev_checking_enabled = false;
140 proxy_ssl_config_.rev_checking_enabled = false; 140 proxy_ssl_config_.rev_checking_enabled = false;
141 } 141 }
(...skipping 1488 matching lines...) Expand 10 before | Expand all | Expand 10 after
1630 DCHECK(stream_request_); 1630 DCHECK(stream_request_);
1631 1631
1632 // Since the transaction can restart with auth credentials, it may create a 1632 // Since the transaction can restart with auth credentials, it may create a
1633 // stream more than once. Accumulate all of the connection attempts across 1633 // stream more than once. Accumulate all of the connection attempts across
1634 // those streams by appending them to the vector: 1634 // those streams by appending them to the vector:
1635 for (const auto& attempt : stream_request_->connection_attempts()) 1635 for (const auto& attempt : stream_request_->connection_attempts())
1636 connection_attempts_.push_back(attempt); 1636 connection_attempts_.push_back(attempt);
1637 } 1637 }
1638 1638
1639 } // namespace net 1639 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698