| 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 <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 // This TransportSecurityState doesn't load or save any state. It's only | 115 // This TransportSecurityState doesn't load or save any state. It's only |
| 116 // used to enforce pinning for system requests and will only use built-in | 116 // used to enforce pinning for system requests and will only use built-in |
| 117 // pins. | 117 // pins. |
| 118 scoped_ptr<net::TransportSecurityState> transport_security_state; | 118 scoped_ptr<net::TransportSecurityState> transport_security_state; |
| 119 scoped_refptr<net::SSLConfigService> ssl_config_service; | 119 scoped_refptr<net::SSLConfigService> ssl_config_service; |
| 120 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; | 120 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; |
| 121 scoped_ptr<net::HttpServerProperties> http_server_properties; | 121 scoped_ptr<net::HttpServerProperties> http_server_properties; |
| 122 scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service; | 122 scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service; |
| 123 scoped_ptr<net::HttpTransactionFactory> | 123 scoped_ptr<net::HttpTransactionFactory> |
| 124 proxy_script_fetcher_http_transaction_factory; | 124 proxy_script_fetcher_http_transaction_factory; |
| 125 scoped_ptr<net::FtpTransactionFactory> | |
| 126 proxy_script_fetcher_ftp_transaction_factory; | |
| 127 scoped_ptr<net::URLRequestThrottlerManager> throttler_manager; | 125 scoped_ptr<net::URLRequestThrottlerManager> throttler_manager; |
| 128 scoped_ptr<net::URLSecurityManager> url_security_manager; | 126 scoped_ptr<net::URLSecurityManager> url_security_manager; |
| 129 // TODO(willchan): Remove proxy script fetcher context since it's not | 127 // TODO(willchan): Remove proxy script fetcher context since it's not |
| 130 // necessary now that I got rid of refcounting URLRequestContexts. | 128 // necessary now that I got rid of refcounting URLRequestContexts. |
| 131 // | 129 // |
| 132 // The first URLRequestContext is |system_url_request_context|. We introduce | 130 // The first URLRequestContext is |system_url_request_context|. We introduce |
| 133 // |proxy_script_fetcher_context| for the second context. It has a direct | 131 // |proxy_script_fetcher_context| for the second context. It has a direct |
| 134 // ProxyService, since we always directly connect to fetch the PAC script. | 132 // ProxyService, since we always directly connect to fetch the PAC script. |
| 135 scoped_ptr<net::URLRequestContext> proxy_script_fetcher_context; | 133 scoped_ptr<net::URLRequestContext> proxy_script_fetcher_context; |
| 136 scoped_ptr<net::ProxyService> system_proxy_service; | 134 scoped_ptr<net::ProxyService> system_proxy_service; |
| 137 scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory; | 135 scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory; |
| 138 scoped_ptr<net::FtpTransactionFactory> system_ftp_transaction_factory; | |
| 139 scoped_ptr<net::URLRequestContext> system_request_context; | 136 scoped_ptr<net::URLRequestContext> system_request_context; |
| 140 SystemRequestContextLeakChecker system_request_context_leak_checker; | 137 SystemRequestContextLeakChecker system_request_context_leak_checker; |
| 141 // |system_cookie_store| and |system_server_bound_cert_service| are shared | 138 // |system_cookie_store| and |system_server_bound_cert_service| are shared |
| 142 // between |proxy_script_fetcher_context| and |system_request_context|. | 139 // between |proxy_script_fetcher_context| and |system_request_context|. |
| 143 scoped_refptr<net::CookieStore> system_cookie_store; | 140 scoped_refptr<net::CookieStore> system_cookie_store; |
| 144 scoped_refptr<extensions::EventRouterForwarder> | 141 scoped_refptr<extensions::EventRouterForwarder> |
| 145 extension_event_router_forwarder; | 142 extension_event_router_forwarder; |
| 146 scoped_ptr<chrome_browser_net::HttpPipeliningCompatibilityClient> | 143 scoped_ptr<chrome_browser_net::HttpPipeliningCompatibilityClient> |
| 147 http_pipelining_compatibility_client; | 144 http_pipelining_compatibility_client; |
| 148 scoped_ptr<chrome_browser_net::LoadTimeStats> load_time_stats; | 145 scoped_ptr<chrome_browser_net::LoadTimeStats> load_time_stats; |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 | 298 |
| 302 // True if SPDY is disabled by policy. | 299 // True if SPDY is disabled by policy. |
| 303 bool is_spdy_disabled_by_policy_; | 300 bool is_spdy_disabled_by_policy_; |
| 304 | 301 |
| 305 base::WeakPtrFactory<IOThread> weak_factory_; | 302 base::WeakPtrFactory<IOThread> weak_factory_; |
| 306 | 303 |
| 307 DISALLOW_COPY_AND_ASSIGN(IOThread); | 304 DISALLOW_COPY_AND_ASSIGN(IOThread); |
| 308 }; | 305 }; |
| 309 | 306 |
| 310 #endif // CHROME_BROWSER_IO_THREAD_H_ | 307 #endif // CHROME_BROWSER_IO_THREAD_H_ |
| OLD | NEW |