| 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 #include "chrome/browser/io_thread.h" | 5 #include "chrome/browser/io_thread.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| 11 #include "base/bind.h" | 11 #include "base/bind.h" |
| 12 #include "base/bind_helpers.h" | 12 #include "base/bind_helpers.h" |
| 13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
| 14 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
| 15 #include "base/debug/leak_tracker.h" | 15 #include "base/debug/leak_tracker.h" |
| 16 #include "base/environment.h" | 16 #include "base/environment.h" |
| 17 #include "base/files/file_path.h" | 17 #include "base/files/file_path.h" |
| 18 #include "base/logging.h" | 18 #include "base/logging.h" |
| 19 #include "base/macros.h" | 19 #include "base/macros.h" |
| 20 #include "base/metrics/field_trial.h" | 20 #include "base/metrics/field_trial.h" |
| 21 #include "base/prefs/pref_registry_simple.h" | |
| 22 #include "base/prefs/pref_service.h" | |
| 23 #include "base/profiler/scoped_tracker.h" | 21 #include "base/profiler/scoped_tracker.h" |
| 24 #include "base/stl_util.h" | 22 #include "base/stl_util.h" |
| 25 #include "base/strings/string_number_conversions.h" | 23 #include "base/strings/string_number_conversions.h" |
| 26 #include "base/strings/string_piece.h" | 24 #include "base/strings/string_piece.h" |
| 27 #include "base/strings/string_split.h" | 25 #include "base/strings/string_split.h" |
| 28 #include "base/strings/string_util.h" | 26 #include "base/strings/string_util.h" |
| 29 #include "base/strings/utf_string_conversions.h" | 27 #include "base/strings/utf_string_conversions.h" |
| 30 #include "base/threading/sequenced_worker_pool.h" | 28 #include "base/threading/sequenced_worker_pool.h" |
| 31 #include "base/threading/thread.h" | 29 #include "base/threading/thread.h" |
| 32 #include "base/threading/worker_pool.h" | 30 #include "base/threading/worker_pool.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 44 #include "chrome/common/chrome_content_client.h" | 42 #include "chrome/common/chrome_content_client.h" |
| 45 #include "chrome/common/chrome_switches.h" | 43 #include "chrome/common/chrome_switches.h" |
| 46 #include "chrome/common/pref_names.h" | 44 #include "chrome/common/pref_names.h" |
| 47 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_pref
s.h" | 45 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_pref
s.h" |
| 48 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param
s.h" | 46 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param
s.h" |
| 49 #include "components/data_usage/core/data_use_aggregator.h" | 47 #include "components/data_usage/core/data_use_aggregator.h" |
| 50 #include "components/data_usage/core/data_use_amortizer.h" | 48 #include "components/data_usage/core/data_use_amortizer.h" |
| 51 #include "components/data_usage/core/data_use_annotator.h" | 49 #include "components/data_usage/core/data_use_annotator.h" |
| 52 #include "components/net_log/chrome_net_log.h" | 50 #include "components/net_log/chrome_net_log.h" |
| 53 #include "components/policy/core/common/policy_service.h" | 51 #include "components/policy/core/common/policy_service.h" |
| 52 #include "components/prefs/pref_registry_simple.h" |
| 53 #include "components/prefs/pref_service.h" |
| 54 #include "components/proxy_config/pref_proxy_config_tracker.h" | 54 #include "components/proxy_config/pref_proxy_config_tracker.h" |
| 55 #include "components/variations/variations_associated_data.h" | 55 #include "components/variations/variations_associated_data.h" |
| 56 #include "components/version_info/version_info.h" | 56 #include "components/version_info/version_info.h" |
| 57 #include "content/public/browser/browser_thread.h" | 57 #include "content/public/browser/browser_thread.h" |
| 58 #include "content/public/browser/cookie_store_factory.h" | 58 #include "content/public/browser/cookie_store_factory.h" |
| 59 #include "content/public/common/content_features.h" | 59 #include "content/public/common/content_features.h" |
| 60 #include "content/public/common/content_switches.h" | 60 #include "content/public/common/content_switches.h" |
| 61 #include "content/public/common/user_agent.h" | 61 #include "content/public/common/user_agent.h" |
| 62 #include "net/base/external_estimate_provider.h" | 62 #include "net/base/external_estimate_provider.h" |
| 63 #include "net/base/host_mapping_rules.h" | 63 #include "net/base/host_mapping_rules.h" |
| (...skipping 1774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1838 std::move(job_factory); | 1838 std::move(job_factory); |
| 1839 | 1839 |
| 1840 context->set_job_factory( | 1840 context->set_job_factory( |
| 1841 globals->proxy_script_fetcher_url_request_job_factory.get()); | 1841 globals->proxy_script_fetcher_url_request_job_factory.get()); |
| 1842 | 1842 |
| 1843 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1843 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
| 1844 // system URLRequestContext too. There's no reason this should be tied to a | 1844 // system URLRequestContext too. There's no reason this should be tied to a |
| 1845 // profile. | 1845 // profile. |
| 1846 return context; | 1846 return context; |
| 1847 } | 1847 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1658793002:
Update chrome for new prefs location. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master