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_network_transaction.h" | 5 #include "net/http/http_network_transaction.h" |
6 | 6 |
7 #include <math.h> // ceil | 7 #include <math.h> // ceil |
8 #include <stdarg.h> | 8 #include <stdarg.h> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
14 #include "base/file_path.h" | 14 #include "base/file_path.h" |
15 #include "base/file_util.h" | 15 #include "base/file_util.h" |
16 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
17 #include "base/metrics/histogram.h" | 17 #include "base/metrics/histogram.h" |
18 #include "base/test/test_file_util.h" | 18 #include "base/test/test_file_util.h" |
19 #include "base/utf_string_conversions.h" | 19 #include "base/utf_string_conversions.h" |
20 #include "net/base/auth.h" | 20 #include "net/base/auth.h" |
21 #include "net/base/capturing_net_log.h" | 21 #include "net/base/capturing_net_log.h" |
| 22 #include "net/base/cert_verifier.h" |
22 #include "net/base/completion_callback.h" | 23 #include "net/base/completion_callback.h" |
23 #include "net/base/host_cache.h" | 24 #include "net/base/host_cache.h" |
24 #include "net/base/mock_host_resolver.h" | 25 #include "net/base/mock_host_resolver.h" |
25 #include "net/base/net_log.h" | 26 #include "net/base/net_log.h" |
26 #include "net/base/net_log_unittest.h" | 27 #include "net/base/net_log_unittest.h" |
27 #include "net/base/request_priority.h" | 28 #include "net/base/request_priority.h" |
28 #include "net/base/ssl_cert_request_info.h" | 29 #include "net/base/ssl_cert_request_info.h" |
29 #include "net/base/ssl_config_service_defaults.h" | 30 #include "net/base/ssl_config_service_defaults.h" |
30 #include "net/base/ssl_info.h" | 31 #include "net/base/ssl_info.h" |
31 #include "net/base/test_completion_callback.h" | 32 #include "net/base/test_completion_callback.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 namespace net { | 116 namespace net { |
116 | 117 |
117 namespace { | 118 namespace { |
118 | 119 |
119 // Helper to manage the lifetimes of the dependencies for a | 120 // Helper to manage the lifetimes of the dependencies for a |
120 // HttpNetworkTransaction. | 121 // HttpNetworkTransaction. |
121 struct SessionDependencies { | 122 struct SessionDependencies { |
122 // Default set of dependencies -- "null" proxy service. | 123 // Default set of dependencies -- "null" proxy service. |
123 SessionDependencies() | 124 SessionDependencies() |
124 : host_resolver(new MockHostResolver), | 125 : host_resolver(new MockHostResolver), |
125 cert_verifier(new CertVerifier), | 126 cert_verifier(CertVerifier::CreateDefault()), |
126 proxy_service(ProxyService::CreateDirect()), | 127 proxy_service(ProxyService::CreateDirect()), |
127 ssl_config_service(new SSLConfigServiceDefaults), | 128 ssl_config_service(new SSLConfigServiceDefaults), |
128 http_auth_handler_factory( | 129 http_auth_handler_factory( |
129 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), | 130 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), |
130 net_log(NULL) {} | 131 net_log(NULL) {} |
131 | 132 |
132 // Custom proxy service dependency. | 133 // Custom proxy service dependency. |
133 explicit SessionDependencies(ProxyService* proxy_service) | 134 explicit SessionDependencies(ProxyService* proxy_service) |
134 : host_resolver(new MockHostResolver), | 135 : host_resolver(new MockHostResolver), |
135 cert_verifier(new CertVerifier), | 136 cert_verifier(CertVerifier::CreateDefault()), |
136 proxy_service(proxy_service), | 137 proxy_service(proxy_service), |
137 ssl_config_service(new SSLConfigServiceDefaults), | 138 ssl_config_service(new SSLConfigServiceDefaults), |
138 http_auth_handler_factory( | 139 http_auth_handler_factory( |
139 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), | 140 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), |
140 net_log(NULL) {} | 141 net_log(NULL) {} |
141 | 142 |
142 scoped_ptr<MockHostResolverBase> host_resolver; | 143 scoped_ptr<MockHostResolverBase> host_resolver; |
143 scoped_ptr<CertVerifier> cert_verifier; | 144 scoped_ptr<CertVerifier> cert_verifier; |
144 scoped_ptr<ProxyService> proxy_service; | 145 scoped_ptr<ProxyService> proxy_service; |
145 scoped_refptr<SSLConfigService> ssl_config_service; | 146 scoped_refptr<SSLConfigService> ssl_config_service; |
(...skipping 9402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
9548 HttpStreamFactory::SetNextProtos(std::vector<std::string>()); | 9549 HttpStreamFactory::SetNextProtos(std::vector<std::string>()); |
9549 ClientSocketPoolManager::set_max_sockets_per_pool( | 9550 ClientSocketPoolManager::set_max_sockets_per_pool( |
9550 HttpNetworkSession::NORMAL_SOCKET_POOL, old_max_sockets_per_pool); | 9551 HttpNetworkSession::NORMAL_SOCKET_POOL, old_max_sockets_per_pool); |
9551 ClientSocketPoolManager::set_max_sockets_per_proxy_server( | 9552 ClientSocketPoolManager::set_max_sockets_per_proxy_server( |
9552 HttpNetworkSession::NORMAL_SOCKET_POOL, old_max_sockets_per_proxy_server); | 9553 HttpNetworkSession::NORMAL_SOCKET_POOL, old_max_sockets_per_proxy_server); |
9553 ClientSocketPoolManager::set_max_sockets_per_group( | 9554 ClientSocketPoolManager::set_max_sockets_per_group( |
9554 HttpNetworkSession::NORMAL_SOCKET_POOL, old_max_sockets_per_group); | 9555 HttpNetworkSession::NORMAL_SOCKET_POOL, old_max_sockets_per_group); |
9555 } | 9556 } |
9556 | 9557 |
9557 } // namespace net | 9558 } // namespace net |
OLD | NEW |