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

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

Issue 135373002: Added SSLHostInfo. Storing of server host info to our standard disk cache. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with TOT Created 6 years, 11 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
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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 /* server_bound_cert_service */,
142 NULL /* transport_security_state */, 142 NULL /* transport_security_state */,
143 NULL /* cert_transparency_verifier */, 143 NULL /* cert_transparency_verifier */,
144 NULL /* ssl_host_info_factory */,
144 std::string() /* ssl_session_cache_shard */, 145 std::string() /* ssl_session_cache_shard */,
145 &socket_factory_, 146 &socket_factory_,
146 transport_pool ? &transport_socket_pool_ : NULL, 147 transport_pool ? &transport_socket_pool_ : NULL,
147 socks_pool ? &socks_socket_pool_ : NULL, 148 socks_pool ? &socks_socket_pool_ : NULL,
148 http_proxy_pool ? &http_proxy_socket_pool_ : NULL, 149 http_proxy_pool ? &http_proxy_socket_pool_ : NULL,
149 NULL, 150 NULL,
150 NULL)); 151 NULL));
151 } 152 }
152 153
153 scoped_refptr<SSLSocketParams> SSLParams(ProxyServer::Scheme proxy, 154 scoped_refptr<SSLSocketParams> SSLParams(ProxyServer::Scheme proxy,
(...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after
930 ssl.channel_id_sent = true; 931 ssl.channel_id_sent = true;
931 ssl.SetNextProto(GetParam()); 932 ssl.SetNextProto(GetParam());
932 TestIPPoolingDisabled(&ssl); 933 TestIPPoolingDisabled(&ssl);
933 } 934 }
934 935
935 // It would be nice to also test the timeouts in SSLClientSocketPool. 936 // It would be nice to also test the timeouts in SSLClientSocketPool.
936 937
937 } // namespace 938 } // namespace
938 939
939 } // namespace net 940 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698