| 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 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 scoped_ptr<net::URLSecurityManager> url_security_manager; | 136 scoped_ptr<net::URLSecurityManager> url_security_manager; |
| 137 // TODO(willchan): Remove proxy script fetcher context since it's not | 137 // TODO(willchan): Remove proxy script fetcher context since it's not |
| 138 // necessary now that I got rid of refcounting URLRequestContexts. | 138 // necessary now that I got rid of refcounting URLRequestContexts. |
| 139 // | 139 // |
| 140 // The first URLRequestContext is |system_url_request_context|. We introduce | 140 // The first URLRequestContext is |system_url_request_context|. We introduce |
| 141 // |proxy_script_fetcher_context| for the second context. It has a direct | 141 // |proxy_script_fetcher_context| for the second context. It has a direct |
| 142 // ProxyService, since we always directly connect to fetch the PAC script. | 142 // ProxyService, since we always directly connect to fetch the PAC script. |
| 143 scoped_ptr<net::URLRequestContext> proxy_script_fetcher_context; | 143 scoped_ptr<net::URLRequestContext> proxy_script_fetcher_context; |
| 144 scoped_ptr<net::ProxyService> system_proxy_service; | 144 scoped_ptr<net::ProxyService> system_proxy_service; |
| 145 scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory; | 145 scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory; |
| 146 scoped_ptr<net::URLRequestJobFactory> system_url_request_job_factory; |
| 146 scoped_ptr<net::URLRequestContext> system_request_context; | 147 scoped_ptr<net::URLRequestContext> system_request_context; |
| 147 SystemRequestContextLeakChecker system_request_context_leak_checker; | 148 SystemRequestContextLeakChecker system_request_context_leak_checker; |
| 148 // |system_cookie_store| and |system_server_bound_cert_service| are shared | 149 // |system_cookie_store| and |system_server_bound_cert_service| are shared |
| 149 // between |proxy_script_fetcher_context| and |system_request_context|. | 150 // between |proxy_script_fetcher_context| and |system_request_context|. |
| 150 scoped_refptr<net::CookieStore> system_cookie_store; | 151 scoped_refptr<net::CookieStore> system_cookie_store; |
| 151 scoped_refptr<extensions::EventRouterForwarder> | 152 scoped_refptr<extensions::EventRouterForwarder> |
| 152 extension_event_router_forwarder; | 153 extension_event_router_forwarder; |
| 153 scoped_ptr<net::HostMappingRules> host_mapping_rules; | 154 scoped_ptr<net::HostMappingRules> host_mapping_rules; |
| 154 scoped_ptr<net::HttpUserAgentSettings> http_user_agent_settings; | 155 scoped_ptr<net::HttpUserAgentSettings> http_user_agent_settings; |
| 155 bool ignore_certificate_errors; | 156 bool ignore_certificate_errors; |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 373 bool is_spdy_disabled_by_policy_; | 374 bool is_spdy_disabled_by_policy_; |
| 374 | 375 |
| 375 base::WeakPtrFactory<IOThread> weak_factory_; | 376 base::WeakPtrFactory<IOThread> weak_factory_; |
| 376 | 377 |
| 377 const base::TimeTicks creation_time_; | 378 const base::TimeTicks creation_time_; |
| 378 | 379 |
| 379 DISALLOW_COPY_AND_ASSIGN(IOThread); | 380 DISALLOW_COPY_AND_ASSIGN(IOThread); |
| 380 }; | 381 }; |
| 381 | 382 |
| 382 #endif // CHROME_BROWSER_IO_THREAD_H_ | 383 #endif // CHROME_BROWSER_IO_THREAD_H_ |
| OLD | NEW |