OLD | NEW |
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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 ignored_ssl_socket_params_(new SSLSocketParams( | 55 ignored_ssl_socket_params_(new SSLSocketParams( |
55 ignored_transport_socket_params_, NULL, NULL, | 56 ignored_transport_socket_params_, NULL, NULL, |
56 ProxyServer::SCHEME_DIRECT, HostPortPair("www.google.com", 443), | 57 ProxyServer::SCHEME_DIRECT, HostPortPair("www.google.com", 443), |
57 ssl_config_, 0, false, false)), | 58 ssl_config_, 0, false, false)), |
58 tcp_histograms_("MockTCP"), | 59 tcp_histograms_("MockTCP"), |
59 transport_socket_pool_( | 60 transport_socket_pool_( |
60 kMaxSockets, kMaxSocketsPerGroup, | 61 kMaxSockets, kMaxSocketsPerGroup, |
61 &tcp_histograms_, | 62 &tcp_histograms_, |
62 &socket_factory_), | 63 &socket_factory_), |
63 ssl_histograms_("MockSSL"), | 64 ssl_histograms_("MockSSL"), |
| 65 cert_verifier_(CertVerifier::CreateDefaultCertVerifier()), |
64 proxy_service_(ProxyService::CreateDirect()), | 66 proxy_service_(ProxyService::CreateDirect()), |
65 ssl_config_service_(new SSLConfigServiceDefaults), | 67 ssl_config_service_(new SSLConfigServiceDefaults), |
66 ssl_socket_pool_(kMaxSockets, kMaxSocketsPerGroup, | 68 ssl_socket_pool_(kMaxSockets, kMaxSocketsPerGroup, |
67 &ssl_histograms_, | 69 &ssl_histograms_, |
68 &host_resolver_, | 70 &host_resolver_, |
69 &cert_verifier_, | 71 cert_verifier_.get(), |
70 NULL /* origin_bound_cert_store */, | 72 NULL /* origin_bound_cert_store */, |
71 NULL /* transport_security_state */, | 73 NULL /* transport_security_state */, |
72 NULL /* ssl_host_info_factory */, | 74 NULL /* ssl_host_info_factory */, |
73 "" /* ssl_session_cache_shard */, | 75 "" /* ssl_session_cache_shard */, |
74 &socket_factory_, | 76 &socket_factory_, |
75 &transport_socket_pool_, | 77 &transport_socket_pool_, |
76 NULL, | 78 NULL, |
77 NULL, | 79 NULL, |
78 ssl_config_service_.get(), | 80 ssl_config_service_.get(), |
79 BoundNetLog().net_log()), | 81 BoundNetLog().net_log()), |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 spdy::SpdyFramer::set_enable_compression_default(false); | 177 spdy::SpdyFramer::set_enable_compression_default(false); |
176 ssl_data_->next_proto_status = SSLClientSocket::kNextProtoNegotiated; | 178 ssl_data_->next_proto_status = SSLClientSocket::kNextProtoNegotiated; |
177 ssl_data_->next_proto = "spdy/2.1"; | 179 ssl_data_->next_proto = "spdy/2.1"; |
178 ssl_data_->was_npn_negotiated = true; | 180 ssl_data_->was_npn_negotiated = true; |
179 ssl_data_->protocol_negotiated = SSLClientSocket::kProtoSPDY21; | 181 ssl_data_->protocol_negotiated = SSLClientSocket::kProtoSPDY21; |
180 } | 182 } |
181 | 183 |
182 HttpNetworkSession* CreateNetworkSession() { | 184 HttpNetworkSession* CreateNetworkSession() { |
183 HttpNetworkSession::Params params; | 185 HttpNetworkSession::Params params; |
184 params.host_resolver = &host_resolver_; | 186 params.host_resolver = &host_resolver_; |
185 params.cert_verifier = &cert_verifier_; | 187 params.cert_verifier = cert_verifier_.get(); |
186 params.proxy_service = proxy_service_.get(); | 188 params.proxy_service = proxy_service_.get(); |
187 params.client_socket_factory = &socket_factory_; | 189 params.client_socket_factory = &socket_factory_; |
188 params.ssl_config_service = ssl_config_service_; | 190 params.ssl_config_service = ssl_config_service_; |
189 params.http_auth_handler_factory = http_auth_handler_factory_.get(); | 191 params.http_auth_handler_factory = http_auth_handler_factory_.get(); |
190 params.http_server_properties = &http_server_properties_; | 192 params.http_server_properties = &http_server_properties_; |
191 return new HttpNetworkSession(params); | 193 return new HttpNetworkSession(params); |
192 } | 194 } |
193 | 195 |
194 private: | 196 private: |
195 SSLConfig ssl_config_; | 197 SSLConfig ssl_config_; |
196 | 198 |
197 scoped_refptr<TransportSocketParams> ignored_transport_socket_params_; | 199 scoped_refptr<TransportSocketParams> ignored_transport_socket_params_; |
198 scoped_refptr<SSLSocketParams> ignored_ssl_socket_params_; | 200 scoped_refptr<SSLSocketParams> ignored_ssl_socket_params_; |
199 ClientSocketPoolHistograms tcp_histograms_; | 201 ClientSocketPoolHistograms tcp_histograms_; |
200 DeterministicMockClientSocketFactory socket_factory_; | 202 DeterministicMockClientSocketFactory socket_factory_; |
201 MockTransportClientSocketPool transport_socket_pool_; | 203 MockTransportClientSocketPool transport_socket_pool_; |
202 ClientSocketPoolHistograms ssl_histograms_; | 204 ClientSocketPoolHistograms ssl_histograms_; |
203 MockHostResolver host_resolver_; | 205 MockHostResolver host_resolver_; |
204 CertVerifier cert_verifier_; | 206 scoped_ptr<CertVerifier> cert_verifier_; |
205 const scoped_ptr<ProxyService> proxy_service_; | 207 const scoped_ptr<ProxyService> proxy_service_; |
206 const scoped_refptr<SSLConfigService> ssl_config_service_; | 208 const scoped_refptr<SSLConfigService> ssl_config_service_; |
207 SSLClientSocketPool ssl_socket_pool_; | 209 SSLClientSocketPool ssl_socket_pool_; |
208 | 210 |
209 const scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_; | 211 const scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_; |
210 HttpServerPropertiesImpl http_server_properties_; | 212 HttpServerPropertiesImpl http_server_properties_; |
211 const scoped_refptr<HttpNetworkSession> session_; | 213 const scoped_refptr<HttpNetworkSession> session_; |
212 ClientSocketPoolHistograms http_proxy_histograms_; | 214 ClientSocketPoolHistograms http_proxy_histograms_; |
213 | 215 |
214 protected: | 216 protected: |
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
533 // HTTPS or SPDY Proxy CONNECT responses are trustworthy | 535 // HTTPS or SPDY Proxy CONNECT responses are trustworthy |
534 EXPECT_EQ(ERR_HTTPS_PROXY_TUNNEL_RESPONSE, rv); | 536 EXPECT_EQ(ERR_HTTPS_PROXY_TUNNEL_RESPONSE, rv); |
535 EXPECT_TRUE(handle_.is_initialized()); | 537 EXPECT_TRUE(handle_.is_initialized()); |
536 EXPECT_TRUE(handle_.socket()); | 538 EXPECT_TRUE(handle_.socket()); |
537 } | 539 } |
538 } | 540 } |
539 | 541 |
540 // It would be nice to also test the timeouts in HttpProxyClientSocketPool. | 542 // It would be nice to also test the timeouts in HttpProxyClientSocketPool. |
541 | 543 |
542 } // namespace net | 544 } // namespace net |
OLD | NEW |