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 #ifndef CHROME_BROWSER_IO_THREAD_H_ | 5 #ifndef CHROME_BROWSER_IO_THREAD_H_ |
6 #define CHROME_BROWSER_IO_THREAD_H_ | 6 #define CHROME_BROWSER_IO_THREAD_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 namespace net { | 46 namespace net { |
47 class CertPolicyEnforcer; | 47 class CertPolicyEnforcer; |
48 class CertVerifier; | 48 class CertVerifier; |
49 class ChannelIDService; | 49 class ChannelIDService; |
50 class CookieStore; | 50 class CookieStore; |
51 class CTVerifier; | 51 class CTVerifier; |
52 class FtpTransactionFactory; | 52 class FtpTransactionFactory; |
53 class HostMappingRules; | 53 class HostMappingRules; |
54 class HostResolver; | 54 class HostResolver; |
55 class HttpAuthHandlerFactory; | 55 class HttpAuthHandlerFactory; |
| 56 class HttpNetworkSession; |
56 class HttpServerProperties; | 57 class HttpServerProperties; |
57 class HttpTransactionFactory; | 58 class HttpTransactionFactory; |
58 class HttpUserAgentSettings; | 59 class HttpUserAgentSettings; |
59 class NetworkDelegate; | 60 class NetworkDelegate; |
60 class NetworkQualityEstimator; | 61 class NetworkQualityEstimator; |
61 class ProxyConfigService; | 62 class ProxyConfigService; |
62 class ProxyService; | 63 class ProxyService; |
63 class SSLConfigService; | 64 class SSLConfigService; |
64 class TransportSecurityState; | 65 class TransportSecurityState; |
65 class URLRequestBackoffManager; | 66 class URLRequestBackoffManager; |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 // This TransportSecurityState doesn't load or save any state. It's only | 132 // This TransportSecurityState doesn't load or save any state. It's only |
132 // used to enforce pinning for system requests and will only use built-in | 133 // used to enforce pinning for system requests and will only use built-in |
133 // pins. | 134 // pins. |
134 scoped_ptr<net::TransportSecurityState> transport_security_state; | 135 scoped_ptr<net::TransportSecurityState> transport_security_state; |
135 scoped_ptr<net::CTVerifier> cert_transparency_verifier; | 136 scoped_ptr<net::CTVerifier> cert_transparency_verifier; |
136 scoped_ptr<net::CertPolicyEnforcer> cert_policy_enforcer; | 137 scoped_ptr<net::CertPolicyEnforcer> cert_policy_enforcer; |
137 scoped_refptr<net::SSLConfigService> ssl_config_service; | 138 scoped_refptr<net::SSLConfigService> ssl_config_service; |
138 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; | 139 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; |
139 scoped_ptr<net::HttpServerProperties> http_server_properties; | 140 scoped_ptr<net::HttpServerProperties> http_server_properties; |
140 scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service; | 141 scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service; |
| 142 scoped_ptr<net::HttpNetworkSession> |
| 143 proxy_script_fetcher_http_network_session; |
141 scoped_ptr<net::HttpTransactionFactory> | 144 scoped_ptr<net::HttpTransactionFactory> |
142 proxy_script_fetcher_http_transaction_factory; | 145 proxy_script_fetcher_http_transaction_factory; |
143 scoped_ptr<net::FtpTransactionFactory> | 146 scoped_ptr<net::FtpTransactionFactory> |
144 proxy_script_fetcher_ftp_transaction_factory; | 147 proxy_script_fetcher_ftp_transaction_factory; |
145 scoped_ptr<net::URLRequestJobFactory> | 148 scoped_ptr<net::URLRequestJobFactory> |
146 proxy_script_fetcher_url_request_job_factory; | 149 proxy_script_fetcher_url_request_job_factory; |
147 scoped_ptr<net::URLRequestBackoffManager> url_request_backoff_manager; | 150 scoped_ptr<net::URLRequestBackoffManager> url_request_backoff_manager; |
148 scoped_ptr<net::URLSecurityManager> url_security_manager; | 151 scoped_ptr<net::URLSecurityManager> url_security_manager; |
149 // TODO(willchan): Remove proxy script fetcher context since it's not | 152 // TODO(willchan): Remove proxy script fetcher context since it's not |
150 // necessary now that I got rid of refcounting URLRequestContexts. | 153 // necessary now that I got rid of refcounting URLRequestContexts. |
151 // | 154 // |
152 // The first URLRequestContext is |system_url_request_context|. We introduce | 155 // The first URLRequestContext is |system_url_request_context|. We introduce |
153 // |proxy_script_fetcher_context| for the second context. It has a direct | 156 // |proxy_script_fetcher_context| for the second context. It has a direct |
154 // ProxyService, since we always directly connect to fetch the PAC script. | 157 // ProxyService, since we always directly connect to fetch the PAC script. |
155 scoped_ptr<net::URLRequestContext> proxy_script_fetcher_context; | 158 scoped_ptr<net::URLRequestContext> proxy_script_fetcher_context; |
156 scoped_ptr<net::ProxyService> system_proxy_service; | 159 scoped_ptr<net::ProxyService> system_proxy_service; |
| 160 scoped_ptr<net::HttpNetworkSession> system_http_network_session; |
157 scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory; | 161 scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory; |
158 scoped_ptr<net::URLRequestJobFactory> system_url_request_job_factory; | 162 scoped_ptr<net::URLRequestJobFactory> system_url_request_job_factory; |
159 scoped_ptr<net::URLRequestContext> system_request_context; | 163 scoped_ptr<net::URLRequestContext> system_request_context; |
160 SystemRequestContextLeakChecker system_request_context_leak_checker; | 164 SystemRequestContextLeakChecker system_request_context_leak_checker; |
161 // |system_cookie_store| and |system_channel_id_service| are shared | 165 // |system_cookie_store| and |system_channel_id_service| are shared |
162 // between |proxy_script_fetcher_context| and |system_request_context|. | 166 // between |proxy_script_fetcher_context| and |system_request_context|. |
163 scoped_refptr<net::CookieStore> system_cookie_store; | 167 scoped_refptr<net::CookieStore> system_cookie_store; |
164 #if defined(ENABLE_EXTENSIONS) | 168 #if defined(ENABLE_EXTENSIONS) |
165 scoped_refptr<extensions::EventRouterForwarder> | 169 scoped_refptr<extensions::EventRouterForwarder> |
166 extension_event_router_forwarder; | 170 extension_event_router_forwarder; |
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
507 bool is_quic_allowed_by_policy_; | 511 bool is_quic_allowed_by_policy_; |
508 | 512 |
509 const base::TimeTicks creation_time_; | 513 const base::TimeTicks creation_time_; |
510 | 514 |
511 base::WeakPtrFactory<IOThread> weak_factory_; | 515 base::WeakPtrFactory<IOThread> weak_factory_; |
512 | 516 |
513 DISALLOW_COPY_AND_ASSIGN(IOThread); | 517 DISALLOW_COPY_AND_ASSIGN(IOThread); |
514 }; | 518 }; |
515 | 519 |
516 #endif // CHROME_BROWSER_IO_THREAD_H_ | 520 #endif // CHROME_BROWSER_IO_THREAD_H_ |
OLD | NEW |