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