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 <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 std::unique_ptr<net::HttpAuthPreferences> http_auth_preferences; | 169 std::unique_ptr<net::HttpAuthPreferences> http_auth_preferences; |
170 // TODO(willchan): Remove proxy script fetcher context since it's not | 170 // TODO(willchan): Remove proxy script fetcher context since it's not |
171 // necessary now that I got rid of refcounting URLRequestContexts. | 171 // necessary now that I got rid of refcounting URLRequestContexts. |
172 // | 172 // |
173 // The first URLRequestContext is |system_url_request_context|. We introduce | 173 // The first URLRequestContext is |system_url_request_context|. We introduce |
174 // |proxy_script_fetcher_context| for the second context. It has a direct | 174 // |proxy_script_fetcher_context| for the second context. It has a direct |
175 // ProxyService, since we always directly connect to fetch the PAC script. | 175 // ProxyService, since we always directly connect to fetch the PAC script. |
176 std::unique_ptr<net::URLRequestContext> proxy_script_fetcher_context; | 176 std::unique_ptr<net::URLRequestContext> proxy_script_fetcher_context; |
177 std::unique_ptr<net::ProxyService> system_proxy_service; | 177 std::unique_ptr<net::ProxyService> system_proxy_service; |
178 std::unique_ptr<net::HttpNetworkSession> system_http_network_session; | 178 std::unique_ptr<net::HttpNetworkSession> system_http_network_session; |
| 179 std::unique_ptr<net::HttpNetworkSession::SharedParams> |
| 180 http_network_session_shared_params; |
179 std::unique_ptr<net::HttpTransactionFactory> | 181 std::unique_ptr<net::HttpTransactionFactory> |
180 system_http_transaction_factory; | 182 system_http_transaction_factory; |
181 std::unique_ptr<net::URLRequestJobFactory> system_url_request_job_factory; | 183 std::unique_ptr<net::URLRequestJobFactory> system_url_request_job_factory; |
182 std::unique_ptr<net::URLRequestContext> system_request_context; | 184 std::unique_ptr<net::URLRequestContext> system_request_context; |
183 SystemRequestContextLeakChecker system_request_context_leak_checker; | 185 SystemRequestContextLeakChecker system_request_context_leak_checker; |
184 // |system_cookie_store| and |system_channel_id_service| are shared | 186 // |system_cookie_store| and |system_channel_id_service| are shared |
185 // between |proxy_script_fetcher_context| and |system_request_context|. | 187 // between |proxy_script_fetcher_context| and |system_request_context|. |
186 std::unique_ptr<net::CookieStore> system_cookie_store; | 188 std::unique_ptr<net::CookieStore> system_cookie_store; |
187 #if BUILDFLAG(ENABLE_EXTENSIONS) | 189 #if BUILDFLAG(ENABLE_EXTENSIONS) |
188 scoped_refptr<extensions::EventRouterForwarder> | 190 scoped_refptr<extensions::EventRouterForwarder> |
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
402 // Callback for updating data use prefs which needs to be initialized on UI | 404 // Callback for updating data use prefs which needs to be initialized on UI |
403 // thread and passed to |DataUseNetworkDelegate|. | 405 // thread and passed to |DataUseNetworkDelegate|. |
404 metrics::UpdateUsagePrefCallbackType metrics_data_use_forwarder_; | 406 metrics::UpdateUsagePrefCallbackType metrics_data_use_forwarder_; |
405 | 407 |
406 base::WeakPtrFactory<IOThread> weak_factory_; | 408 base::WeakPtrFactory<IOThread> weak_factory_; |
407 | 409 |
408 DISALLOW_COPY_AND_ASSIGN(IOThread); | 410 DISALLOW_COPY_AND_ASSIGN(IOThread); |
409 }; | 411 }; |
410 | 412 |
411 #endif // CHROME_BROWSER_IO_THREAD_H_ | 413 #endif // CHROME_BROWSER_IO_THREAD_H_ |
OLD | NEW |