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

Side by Side Diff: net/http/http_proxy_client_socket_pool_spdy3_unittest.cc

Issue 9476035: Make CertVerifier a pure virtual interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Win shared fix Created 8 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
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/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "net/base/cert_verifier.h"
11 #include "net/base/mock_host_resolver.h" 12 #include "net/base/mock_host_resolver.h"
12 #include "net/base/net_errors.h" 13 #include "net/base/net_errors.h"
13 #include "net/base/ssl_config_service_defaults.h" 14 #include "net/base/ssl_config_service_defaults.h"
14 #include "net/base/test_completion_callback.h" 15 #include "net/base/test_completion_callback.h"
15 #include "net/http/http_auth_handler_factory.h" 16 #include "net/http/http_auth_handler_factory.h"
16 #include "net/http/http_network_session.h" 17 #include "net/http/http_network_session.h"
17 #include "net/http/http_proxy_client_socket.h" 18 #include "net/http/http_proxy_client_socket.h"
18 #include "net/http/http_server_properties_impl.h" 19 #include "net/http/http_server_properties_impl.h"
19 #include "net/proxy/proxy_service.h" 20 #include "net/proxy/proxy_service.h"
20 #include "net/socket/client_socket_handle.h" 21 #include "net/socket/client_socket_handle.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 ignored_ssl_socket_params_(new SSLSocketParams( 57 ignored_ssl_socket_params_(new SSLSocketParams(
57 ignored_transport_socket_params_, NULL, NULL, 58 ignored_transport_socket_params_, NULL, NULL,
58 ProxyServer::SCHEME_DIRECT, HostPortPair("www.google.com", 443), 59 ProxyServer::SCHEME_DIRECT, HostPortPair("www.google.com", 443),
59 ssl_config_, 0, false, false)), 60 ssl_config_, 0, false, false)),
60 tcp_histograms_("MockTCP"), 61 tcp_histograms_("MockTCP"),
61 transport_socket_pool_( 62 transport_socket_pool_(
62 kMaxSockets, kMaxSocketsPerGroup, 63 kMaxSockets, kMaxSocketsPerGroup,
63 &tcp_histograms_, 64 &tcp_histograms_,
64 &socket_factory_), 65 &socket_factory_),
65 ssl_histograms_("MockSSL"), 66 ssl_histograms_("MockSSL"),
67 cert_verifier_(CertVerifier::CreateDefault()),
66 proxy_service_(ProxyService::CreateDirect()), 68 proxy_service_(ProxyService::CreateDirect()),
67 ssl_config_service_(new SSLConfigServiceDefaults), 69 ssl_config_service_(new SSLConfigServiceDefaults),
68 ssl_socket_pool_(kMaxSockets, kMaxSocketsPerGroup, 70 ssl_socket_pool_(kMaxSockets, kMaxSocketsPerGroup,
69 &ssl_histograms_, 71 &ssl_histograms_,
70 &host_resolver_, 72 &host_resolver_,
71 &cert_verifier_, 73 cert_verifier_.get(),
72 NULL /* server_bound_cert_store */, 74 NULL /* server_bound_cert_store */,
73 NULL /* transport_security_state */, 75 NULL /* transport_security_state */,
74 NULL /* ssl_host_info_factory */, 76 NULL /* ssl_host_info_factory */,
75 "" /* ssl_session_cache_shard */, 77 "" /* ssl_session_cache_shard */,
76 &socket_factory_, 78 &socket_factory_,
77 &transport_socket_pool_, 79 &transport_socket_pool_,
78 NULL, 80 NULL,
79 NULL, 81 NULL,
80 ssl_config_service_.get(), 82 ssl_config_service_.get(),
81 BoundNetLog().net_log()), 83 BoundNetLog().net_log()),
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 } 176 }
175 177
176 void InitializeSpdySsl() { 178 void InitializeSpdySsl() {
177 spdy::SpdyFramer::set_enable_compression_default(false); 179 spdy::SpdyFramer::set_enable_compression_default(false);
178 ssl_data_->SetNextProto(SSLClientSocket::kProtoSPDY3); 180 ssl_data_->SetNextProto(SSLClientSocket::kProtoSPDY3);
179 } 181 }
180 182
181 HttpNetworkSession* CreateNetworkSession() { 183 HttpNetworkSession* CreateNetworkSession() {
182 HttpNetworkSession::Params params; 184 HttpNetworkSession::Params params;
183 params.host_resolver = &host_resolver_; 185 params.host_resolver = &host_resolver_;
184 params.cert_verifier = &cert_verifier_; 186 params.cert_verifier = cert_verifier_.get();
185 params.proxy_service = proxy_service_.get(); 187 params.proxy_service = proxy_service_.get();
186 params.client_socket_factory = &socket_factory_; 188 params.client_socket_factory = &socket_factory_;
187 params.ssl_config_service = ssl_config_service_; 189 params.ssl_config_service = ssl_config_service_;
188 params.http_auth_handler_factory = http_auth_handler_factory_.get(); 190 params.http_auth_handler_factory = http_auth_handler_factory_.get();
189 params.http_server_properties = &http_server_properties_; 191 params.http_server_properties = &http_server_properties_;
190 return new HttpNetworkSession(params); 192 return new HttpNetworkSession(params);
191 } 193 }
192 194
193 private: 195 private:
194 SSLConfig ssl_config_; 196 SSLConfig ssl_config_;
195 197
196 scoped_refptr<TransportSocketParams> ignored_transport_socket_params_; 198 scoped_refptr<TransportSocketParams> ignored_transport_socket_params_;
197 scoped_refptr<SSLSocketParams> ignored_ssl_socket_params_; 199 scoped_refptr<SSLSocketParams> ignored_ssl_socket_params_;
198 ClientSocketPoolHistograms tcp_histograms_; 200 ClientSocketPoolHistograms tcp_histograms_;
199 DeterministicMockClientSocketFactory socket_factory_; 201 DeterministicMockClientSocketFactory socket_factory_;
200 MockTransportClientSocketPool transport_socket_pool_; 202 MockTransportClientSocketPool transport_socket_pool_;
201 ClientSocketPoolHistograms ssl_histograms_; 203 ClientSocketPoolHistograms ssl_histograms_;
202 MockHostResolver host_resolver_; 204 MockHostResolver host_resolver_;
203 CertVerifier cert_verifier_; 205 scoped_ptr<CertVerifier> cert_verifier_;
204 const scoped_ptr<ProxyService> proxy_service_; 206 const scoped_ptr<ProxyService> proxy_service_;
205 const scoped_refptr<SSLConfigService> ssl_config_service_; 207 const scoped_refptr<SSLConfigService> ssl_config_service_;
206 SSLClientSocketPool ssl_socket_pool_; 208 SSLClientSocketPool ssl_socket_pool_;
207 209
208 const scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_; 210 const scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_;
209 HttpServerPropertiesImpl http_server_properties_; 211 HttpServerPropertiesImpl http_server_properties_;
210 const scoped_refptr<HttpNetworkSession> session_; 212 const scoped_refptr<HttpNetworkSession> session_;
211 ClientSocketPoolHistograms http_proxy_histograms_; 213 ClientSocketPoolHistograms http_proxy_histograms_;
212 214
213 protected: 215 protected:
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 // HTTPS or SPDY Proxy CONNECT responses are trustworthy 534 // HTTPS or SPDY Proxy CONNECT responses are trustworthy
533 EXPECT_EQ(ERR_HTTPS_PROXY_TUNNEL_RESPONSE, rv); 535 EXPECT_EQ(ERR_HTTPS_PROXY_TUNNEL_RESPONSE, rv);
534 EXPECT_TRUE(handle_.is_initialized()); 536 EXPECT_TRUE(handle_.is_initialized());
535 EXPECT_TRUE(handle_.socket()); 537 EXPECT_TRUE(handle_.socket());
536 } 538 }
537 } 539 }
538 540
539 // It would be nice to also test the timeouts in HttpProxyClientSocketPool. 541 // It would be nice to also test the timeouts in HttpProxyClientSocketPool.
540 542
541 } // namespace net 543 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_proxy_client_socket_pool_spdy2_unittest.cc ('k') | net/http/http_stream_factory_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698