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

Side by Side Diff: net/http/http_proxy_client_socket.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_proxy_client_socket.h" 5 #include "net/http/http_proxy_client_socket.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/profiler/scoped_tracker.h" 9 #include "base/profiler/scoped_tracker.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 140
141 bool HttpProxyClientSocket::IsConnected() const { 141 bool HttpProxyClientSocket::IsConnected() const {
142 return next_state_ == STATE_DONE && transport_->socket()->IsConnected(); 142 return next_state_ == STATE_DONE && transport_->socket()->IsConnected();
143 } 143 }
144 144
145 bool HttpProxyClientSocket::IsConnectedAndIdle() const { 145 bool HttpProxyClientSocket::IsConnectedAndIdle() const {
146 return next_state_ == STATE_DONE && 146 return next_state_ == STATE_DONE &&
147 transport_->socket()->IsConnectedAndIdle(); 147 transport_->socket()->IsConnectedAndIdle();
148 } 148 }
149 149
150 const BoundNetLog& HttpProxyClientSocket::NetLog() const { 150 const NetLogWithSource& HttpProxyClientSocket::NetLog() const {
151 return net_log_; 151 return net_log_;
152 } 152 }
153 153
154 void HttpProxyClientSocket::SetSubresourceSpeculation() { 154 void HttpProxyClientSocket::SetSubresourceSpeculation() {
155 if (transport_.get() && transport_->socket()) { 155 if (transport_.get() && transport_->socket()) {
156 transport_->socket()->SetSubresourceSpeculation(); 156 transport_->socket()->SetSubresourceSpeculation();
157 } else { 157 } else {
158 NOTREACHED(); 158 NOTREACHED();
159 } 159 }
160 } 160 }
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 next_state_ = STATE_DRAIN_BODY; 525 next_state_ = STATE_DRAIN_BODY;
526 return OK; 526 return OK;
527 } 527 }
528 528
529 return DidDrainBodyForAuthRestart(); 529 return DidDrainBodyForAuthRestart();
530 } 530 }
531 531
532 //---------------------------------------------------------------- 532 //----------------------------------------------------------------
533 533
534 } // namespace net 534 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698