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

Side by Side Diff: net/socket/client_socket_handle.cc

Issue 3056040: Revert 54405 - Fix late binding induced mismatch of Socket and AuthController... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « net/socket/client_socket_handle.h ('k') | net/socket/socket_test_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/socket/client_socket_handle.h" 5 #include "net/socket/client_socket_handle.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/histogram.h" 8 #include "base/histogram.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "net/base/net_errors.h" 10 #include "net/base/net_errors.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 pool_ = NULL; 52 pool_ = NULL;
53 idle_time_ = base::TimeDelta(); 53 idle_time_ = base::TimeDelta();
54 init_time_ = base::TimeTicks(); 54 init_time_ = base::TimeTicks();
55 setup_time_ = base::TimeDelta(); 55 setup_time_ = base::TimeDelta();
56 pool_id_ = -1; 56 pool_id_ = -1;
57 } 57 }
58 58
59 void ClientSocketHandle::ResetErrorState() { 59 void ClientSocketHandle::ResetErrorState() {
60 is_ssl_error_ = false; 60 is_ssl_error_ = false;
61 ssl_error_response_info_ = HttpResponseInfo(); 61 ssl_error_response_info_ = HttpResponseInfo();
62 pending_http_proxy_connection_.reset();
63 } 62 }
64 63
65 LoadState ClientSocketHandle::GetLoadState() const { 64 LoadState ClientSocketHandle::GetLoadState() const {
66 CHECK(!is_initialized()); 65 CHECK(!is_initialized());
67 CHECK(!group_name_.empty()); 66 CHECK(!group_name_.empty());
68 // Because of http://crbug.com/37810 we may not have a pool, but have 67 // Because of http://crbug.com/37810 we may not have a pool, but have
69 // just a raw socket. 68 // just a raw socket.
70 if (!pool_) 69 if (!pool_)
71 return LOAD_STATE_IDLE; 70 return LOAD_STATE_IDLE;
72 return pool_->GetLoadState(group_name_, this); 71 return pool_->GetLoadState(group_name_, this);
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 // TODO(eroman): This logging is not complete, in particular set_socket() and 112 // TODO(eroman): This logging is not complete, in particular set_socket() and
114 // release() socket. It ends up working though, since those methods are being 113 // release() socket. It ends up working though, since those methods are being
115 // used to layer sockets (and the destination sources are the same). 114 // used to layer sockets (and the destination sources are the same).
116 DCHECK(socket_.get()); 115 DCHECK(socket_.get());
117 socket_->NetLog().BeginEvent( 116 socket_->NetLog().BeginEvent(
118 NetLog::TYPE_SOCKET_IN_USE, 117 NetLog::TYPE_SOCKET_IN_USE,
119 new NetLogSourceParameter("source_dependency", requesting_source_)); 118 new NetLogSourceParameter("source_dependency", requesting_source_));
120 } 119 }
121 120
122 } // namespace net 121 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/client_socket_handle.h ('k') | net/socket/socket_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698