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

Side by Side Diff: net/socket/ssl_client_socket_unittest.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, 9 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_openssl.cc ('k') | net/socket/ssl_server_socket_nss.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 #include "net/socket/ssl_client_socket.h" 5 #include "net/socket/ssl_client_socket.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "net/base/address_list.h" 9 #include "net/base/address_list.h"
10 #include "net/base/cert_test_util.h" 10 #include "net/base/cert_test_util.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 } 80 }
81 virtual void SetOmniboxSpeculation() OVERRIDE { 81 virtual void SetOmniboxSpeculation() OVERRIDE {
82 transport_->SetOmniboxSpeculation(); 82 transport_->SetOmniboxSpeculation();
83 } 83 }
84 virtual bool WasEverUsed() const OVERRIDE { 84 virtual bool WasEverUsed() const OVERRIDE {
85 return transport_->WasEverUsed(); 85 return transport_->WasEverUsed();
86 } 86 }
87 virtual bool UsingTCPFastOpen() const OVERRIDE { 87 virtual bool UsingTCPFastOpen() const OVERRIDE {
88 return transport_->UsingTCPFastOpen(); 88 return transport_->UsingTCPFastOpen();
89 } 89 }
90 virtual int64 NumBytesRead() const OVERRIDE {
91 return transport_->NumBytesRead();
92 }
93 virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE {
94 return transport_->GetConnectTimeMicros();
95 }
96 virtual bool WasNpnNegotiated() const OVERRIDE { 90 virtual bool WasNpnNegotiated() const OVERRIDE {
97 return transport_->WasNpnNegotiated(); 91 return transport_->WasNpnNegotiated();
98 } 92 }
99 virtual net::NextProto GetNegotiatedProtocol() const OVERRIDE { 93 virtual net::NextProto GetNegotiatedProtocol() const OVERRIDE {
100 return transport_->GetNegotiatedProtocol(); 94 return transport_->GetNegotiatedProtocol();
101 } 95 }
102 virtual bool GetSSLInfo(net::SSLInfo* ssl_info) OVERRIDE { 96 virtual bool GetSSLInfo(net::SSLInfo* ssl_info) OVERRIDE {
103 return transport_->GetSSLInfo(ssl_info); 97 return transport_->GetSSLInfo(ssl_info);
104 } 98 }
105 99
(...skipping 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after
1279 scoped_refptr<net::SSLCertRequestInfo> request_info = 1273 scoped_refptr<net::SSLCertRequestInfo> request_info =
1280 GetCertRequest(ssl_options); 1274 GetCertRequest(ssl_options);
1281 ASSERT_TRUE(request_info); 1275 ASSERT_TRUE(request_info);
1282 ASSERT_EQ(2u, request_info->cert_authorities.size()); 1276 ASSERT_EQ(2u, request_info->cert_authorities.size());
1283 EXPECT_EQ(std::string(reinterpret_cast<const char*>(kThawteDN), kThawteLen), 1277 EXPECT_EQ(std::string(reinterpret_cast<const char*>(kThawteDN), kThawteLen),
1284 request_info->cert_authorities[0]); 1278 request_info->cert_authorities[0]);
1285 EXPECT_EQ( 1279 EXPECT_EQ(
1286 std::string(reinterpret_cast<const char*>(kDiginotarDN), kDiginotarLen), 1280 std::string(reinterpret_cast<const char*>(kDiginotarDN), kDiginotarLen),
1287 request_info->cert_authorities[1]); 1281 request_info->cert_authorities[1]);
1288 } 1282 }
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/socket/ssl_server_socket_nss.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698