OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 ignored_tcp_socket_params_, NULL, NULL, ProxyServer::SCHEME_DIRECT, | 55 ignored_tcp_socket_params_, NULL, NULL, ProxyServer::SCHEME_DIRECT, |
56 HostPortPair("www.google.com", 443), ssl_config_, 0, false, false)), | 56 HostPortPair("www.google.com", 443), ssl_config_, 0, false, false)), |
57 tcp_histograms_("MockTCP"), | 57 tcp_histograms_("MockTCP"), |
58 tcp_socket_pool_( | 58 tcp_socket_pool_( |
59 kMaxSockets, kMaxSocketsPerGroup, | 59 kMaxSockets, kMaxSocketsPerGroup, |
60 &tcp_histograms_, | 60 &tcp_histograms_, |
61 &socket_factory_), | 61 &socket_factory_), |
62 ssl_histograms_("MockSSL"), | 62 ssl_histograms_("MockSSL"), |
63 ssl_config_service_(new SSLConfigServiceDefaults), | 63 ssl_config_service_(new SSLConfigServiceDefaults), |
64 host_resolver_(new MockHostResolver), | 64 host_resolver_(new MockHostResolver), |
| 65 cert_verifier_(new CertVerifier), |
65 ssl_socket_pool_(kMaxSockets, kMaxSocketsPerGroup, | 66 ssl_socket_pool_(kMaxSockets, kMaxSocketsPerGroup, |
66 &ssl_histograms_, | 67 &ssl_histograms_, |
67 host_resolver_.get(), | 68 host_resolver_.get(), |
| 69 cert_verifier_.get(), |
68 NULL /* dnsrr_resolver */, | 70 NULL /* dnsrr_resolver */, |
69 NULL /* dns_cert_checker */, | 71 NULL /* dns_cert_checker */, |
70 NULL /* ssl_host_info_factory */, | 72 NULL /* ssl_host_info_factory */, |
71 &socket_factory_, | 73 &socket_factory_, |
72 &tcp_socket_pool_, | 74 &tcp_socket_pool_, |
73 NULL, | 75 NULL, |
74 NULL, | 76 NULL, |
75 ssl_config_service_.get(), | 77 ssl_config_service_.get(), |
76 BoundNetLog().net_log()), | 78 BoundNetLog().net_log()), |
77 http_auth_handler_factory_( | 79 http_auth_handler_factory_( |
78 HttpAuthHandlerFactory::CreateDefault(host_resolver_.get())), | 80 HttpAuthHandlerFactory::CreateDefault(host_resolver_.get())), |
79 session_(new HttpNetworkSession(host_resolver_.get(), | 81 session_(new HttpNetworkSession(host_resolver_.get(), |
| 82 cert_verifier_.get(), |
80 NULL /* dnsrr_resolver */, | 83 NULL /* dnsrr_resolver */, |
81 NULL /* dns_cert_checker */, | 84 NULL /* dns_cert_checker */, |
82 NULL /* ssl_host_info_factory */, | 85 NULL /* ssl_host_info_factory */, |
83 ProxyService::CreateDirect(), | 86 ProxyService::CreateDirect(), |
84 &socket_factory_, | 87 &socket_factory_, |
85 new SSLConfigServiceDefaults, | 88 new SSLConfigServiceDefaults, |
86 new SpdySessionPool(NULL), | 89 new SpdySessionPool(NULL), |
87 http_auth_handler_factory_.get(), | 90 http_auth_handler_factory_.get(), |
88 NULL, | 91 NULL, |
89 NULL)), | 92 NULL)), |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 SSLConfig ssl_config_; | 188 SSLConfig ssl_config_; |
186 | 189 |
187 scoped_refptr<TCPSocketParams> ignored_tcp_socket_params_; | 190 scoped_refptr<TCPSocketParams> ignored_tcp_socket_params_; |
188 scoped_refptr<SSLSocketParams> ignored_ssl_socket_params_; | 191 scoped_refptr<SSLSocketParams> ignored_ssl_socket_params_; |
189 ClientSocketPoolHistograms tcp_histograms_; | 192 ClientSocketPoolHistograms tcp_histograms_; |
190 DeterministicMockClientSocketFactory socket_factory_; | 193 DeterministicMockClientSocketFactory socket_factory_; |
191 MockTCPClientSocketPool tcp_socket_pool_; | 194 MockTCPClientSocketPool tcp_socket_pool_; |
192 ClientSocketPoolHistograms ssl_histograms_; | 195 ClientSocketPoolHistograms ssl_histograms_; |
193 scoped_refptr<SSLConfigService> ssl_config_service_; | 196 scoped_refptr<SSLConfigService> ssl_config_service_; |
194 scoped_ptr<HostResolver> host_resolver_; | 197 scoped_ptr<HostResolver> host_resolver_; |
| 198 scoped_ptr<CertVerifier> cert_verifier_; |
195 SSLClientSocketPool ssl_socket_pool_; | 199 SSLClientSocketPool ssl_socket_pool_; |
196 | 200 |
197 scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_; | 201 scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_; |
198 scoped_refptr<HttpNetworkSession> session_; | 202 scoped_refptr<HttpNetworkSession> session_; |
199 ClientSocketPoolHistograms http_proxy_histograms_; | 203 ClientSocketPoolHistograms http_proxy_histograms_; |
200 | 204 |
201 protected: | 205 protected: |
202 scoped_ptr<SSLSocketDataProvider> ssl_data_; | 206 scoped_ptr<SSLSocketDataProvider> ssl_data_; |
203 scoped_refptr<DeterministicSocketData> data_; | 207 scoped_refptr<DeterministicSocketData> data_; |
204 HttpProxyClientSocketPool pool_; | 208 HttpProxyClientSocketPool pool_; |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
499 data_->RunFor(2); | 503 data_->RunFor(2); |
500 | 504 |
501 EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, callback_.WaitForResult()); | 505 EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, callback_.WaitForResult()); |
502 EXPECT_FALSE(handle_.is_initialized()); | 506 EXPECT_FALSE(handle_.is_initialized()); |
503 EXPECT_FALSE(handle_.socket()); | 507 EXPECT_FALSE(handle_.socket()); |
504 } | 508 } |
505 | 509 |
506 // It would be nice to also test the timeouts in HttpProxyClientSocketPool. | 510 // It would be nice to also test the timeouts in HttpProxyClientSocketPool. |
507 | 511 |
508 } // namespace net | 512 } // namespace net |
OLD | NEW |