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

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

Issue 869393005: Perform ClientHello padding if the field trial is enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@net_connection_error_uma
Patch Set: Created 5 years, 10 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_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/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 ssl_histograms_.reset(new ClientSocketPoolHistograms("SSLUnitTest")); 142 ssl_histograms_.reset(new ClientSocketPoolHistograms("SSLUnitTest"));
143 pool_.reset(new SSLClientSocketPool( 143 pool_.reset(new SSLClientSocketPool(
144 kMaxSockets, kMaxSocketsPerGroup, ssl_histograms_.get(), 144 kMaxSockets, kMaxSocketsPerGroup, ssl_histograms_.get(),
145 NULL /* cert_verifier */, NULL /* channel_id_service */, 145 NULL /* cert_verifier */, NULL /* channel_id_service */,
146 NULL /* transport_security_state */, 146 NULL /* transport_security_state */,
147 NULL /* cert_transparency_verifier */, NULL /* cert_policy_enforcer */, 147 NULL /* cert_transparency_verifier */, NULL /* cert_policy_enforcer */,
148 std::string() /* ssl_session_cache_shard */, &socket_factory_, 148 std::string() /* ssl_session_cache_shard */, &socket_factory_,
149 transport_pool ? &transport_socket_pool_ : NULL, 149 transport_pool ? &transport_socket_pool_ : NULL,
150 socks_pool ? &socks_socket_pool_ : NULL, 150 socks_pool ? &socks_socket_pool_ : NULL,
151 http_proxy_pool ? &http_proxy_socket_pool_ : NULL, NULL, 151 http_proxy_pool ? &http_proxy_socket_pool_ : NULL, NULL,
152 enable_ssl_connect_job_waiting_, NULL)); 152 enable_ssl_connect_job_waiting_, NULL, NULL));
153 } 153 }
154 154
155 scoped_refptr<SSLSocketParams> SSLParams(ProxyServer::Scheme proxy, 155 scoped_refptr<SSLSocketParams> SSLParams(ProxyServer::Scheme proxy,
156 bool want_spdy_over_npn) { 156 bool want_spdy_over_npn) {
157 return make_scoped_refptr(new SSLSocketParams( 157 return make_scoped_refptr(new SSLSocketParams(
158 proxy == ProxyServer::SCHEME_DIRECT ? direct_transport_socket_params_ 158 proxy == ProxyServer::SCHEME_DIRECT ? direct_transport_socket_params_
159 : NULL, 159 : NULL,
160 proxy == ProxyServer::SCHEME_SOCKS5 ? socks_socket_params_ : NULL, 160 proxy == ProxyServer::SCHEME_SOCKS5 ? socks_socket_params_ : NULL,
161 proxy == ProxyServer::SCHEME_HTTP ? http_proxy_socket_params_ : NULL, 161 proxy == ProxyServer::SCHEME_HTTP ? http_proxy_socket_params_ : NULL,
162 HostPortPair("host", 443), 162 HostPortPair("host", 443),
(...skipping 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after
1386 ssl.channel_id_sent = true; 1386 ssl.channel_id_sent = true;
1387 ssl.SetNextProto(GetParam()); 1387 ssl.SetNextProto(GetParam());
1388 TestIPPoolingDisabled(&ssl); 1388 TestIPPoolingDisabled(&ssl);
1389 } 1389 }
1390 1390
1391 // It would be nice to also test the timeouts in SSLClientSocketPool. 1391 // It would be nice to also test the timeouts in SSLClientSocketPool.
1392 1392
1393 } // namespace 1393 } // namespace
1394 1394
1395 } // namespace net 1395 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698