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

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

Issue 12886034: Remove experimental code to pick the "warmest" socket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: sync, fix conflict Created 7 years, 8 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/ssl_client_socket_nss.h ('k') | net/socket/ssl_client_socket_openssl.h » ('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 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived 5 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived
6 // from AuthCertificateCallback() in 6 // from AuthCertificateCallback() in
7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp. 7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp.
8 8
9 /* ***** BEGIN LICENSE BLOCK ***** 9 /* ***** BEGIN LICENSE BLOCK *****
10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
(...skipping 3015 matching lines...) Expand 10 before | Expand all | Expand 10 after
3026 } 3026 }
3027 3027
3028 bool SSLClientSocketNSS::UsingTCPFastOpen() const { 3028 bool SSLClientSocketNSS::UsingTCPFastOpen() const {
3029 if (transport_.get() && transport_->socket()) { 3029 if (transport_.get() && transport_->socket()) {
3030 return transport_->socket()->UsingTCPFastOpen(); 3030 return transport_->socket()->UsingTCPFastOpen();
3031 } 3031 }
3032 NOTREACHED(); 3032 NOTREACHED();
3033 return false; 3033 return false;
3034 } 3034 }
3035 3035
3036 int64 SSLClientSocketNSS::NumBytesRead() const {
3037 if (transport_.get() && transport_->socket()) {
3038 return transport_->socket()->NumBytesRead();
3039 }
3040 NOTREACHED();
3041 return -1;
3042 }
3043
3044 base::TimeDelta SSLClientSocketNSS::GetConnectTimeMicros() const {
3045 if (transport_.get() && transport_->socket()) {
3046 return transport_->socket()->GetConnectTimeMicros();
3047 }
3048 NOTREACHED();
3049 return base::TimeDelta::FromMicroseconds(-1);
3050 }
3051
3052 int SSLClientSocketNSS::Read(IOBuffer* buf, int buf_len, 3036 int SSLClientSocketNSS::Read(IOBuffer* buf, int buf_len,
3053 const CompletionCallback& callback) { 3037 const CompletionCallback& callback) {
3054 DCHECK(core_); 3038 DCHECK(core_);
3055 DCHECK(!callback.is_null()); 3039 DCHECK(!callback.is_null());
3056 3040
3057 EnterFunction(buf_len); 3041 EnterFunction(buf_len);
3058 int rv = core_->Read(buf, buf_len, callback); 3042 int rv = core_->Read(buf, buf_len, callback);
3059 LeaveFunction(rv); 3043 LeaveFunction(rv);
3060 3044
3061 return rv; 3045 return rv;
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
3530 EnsureThreadIdAssigned(); 3514 EnsureThreadIdAssigned();
3531 base::AutoLock auto_lock(lock_); 3515 base::AutoLock auto_lock(lock_);
3532 return valid_thread_id_ == base::PlatformThread::CurrentId(); 3516 return valid_thread_id_ == base::PlatformThread::CurrentId();
3533 } 3517 }
3534 3518
3535 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const { 3519 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const {
3536 return server_bound_cert_service_; 3520 return server_bound_cert_service_;
3537 } 3521 }
3538 3522
3539 } // namespace net 3523 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_nss.h ('k') | net/socket/ssl_client_socket_openssl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698