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