Chromium Code Reviews

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

Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix cookies_list.js Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | | Annotate | Revision Log
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_pool.h" 5 #include "net/http/http_proxy_client_socket_pool.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 120 matching lines...)
131 } 131 }
132 132
133 void CreatePool(bool transport_pool, bool http_proxy_pool, bool socks_pool) { 133 void CreatePool(bool transport_pool, bool http_proxy_pool, bool socks_pool) {
134 ssl_histograms_.reset(new ClientSocketPoolHistograms("SSLUnitTest")); 134 ssl_histograms_.reset(new ClientSocketPoolHistograms("SSLUnitTest"));
135 pool_.reset(new SSLClientSocketPool( 135 pool_.reset(new SSLClientSocketPool(
136 kMaxSockets, 136 kMaxSockets,
137 kMaxSocketsPerGroup, 137 kMaxSocketsPerGroup,
138 ssl_histograms_.get(), 138 ssl_histograms_.get(),
139 NULL /* host_resolver */, 139 NULL /* host_resolver */,
140 NULL /* cert_verifier */, 140 NULL /* cert_verifier */,
141 NULL /* server_bound_cert_service */, 141 NULL /* channel_id_service */,
142 NULL /* transport_security_state */, 142 NULL /* transport_security_state */,
143 NULL /* cert_transparency_verifier */, 143 NULL /* cert_transparency_verifier */,
144 std::string() /* ssl_session_cache_shard */, 144 std::string() /* ssl_session_cache_shard */,
145 &socket_factory_, 145 &socket_factory_,
146 transport_pool ? &transport_socket_pool_ : NULL, 146 transport_pool ? &transport_socket_pool_ : NULL,
147 socks_pool ? &socks_socket_pool_ : NULL, 147 socks_pool ? &socks_socket_pool_ : NULL,
148 http_proxy_pool ? &http_proxy_socket_pool_ : NULL, 148 http_proxy_pool ? &http_proxy_socket_pool_ : NULL,
149 NULL, 149 NULL,
150 NULL)); 150 NULL));
151 } 151 }
(...skipping 777 matching lines...)
929 ssl.channel_id_sent = true; 929 ssl.channel_id_sent = true;
930 ssl.SetNextProto(GetParam()); 930 ssl.SetNextProto(GetParam());
931 TestIPPoolingDisabled(&ssl); 931 TestIPPoolingDisabled(&ssl);
932 } 932 }
933 933
934 // It would be nice to also test the timeouts in SSLClientSocketPool. 934 // It would be nice to also test the timeouts in SSLClientSocketPool.
935 935
936 } // namespace 936 } // namespace
937 937
938 } // namespace net 938 } // namespace net
OLDNEW

Powered by Google App Engine