diff --git a/components/arc/DEPS b/components/arc/DEPS index 6f780e7ab7a2ba..2f5f4b87cdd50a 100644 --- a/components/arc/DEPS +++ b/components/arc/DEPS @@ -2,6 +2,7 @@ include_rules = [ "+chromeos/arc", "+chromeos/chromeos_switches.h", "+chromeos/dbus", + "+components/prefs", "+components/signin/core/account_id", "+ipc", "+mojo", diff --git a/components/arc/arc_bridge_service_impl.cc b/components/arc/arc_bridge_service_impl.cc index 0760288b1400ad..18e44a76be363f 100644 --- a/components/arc/arc_bridge_service_impl.cc +++ b/components/arc/arc_bridge_service_impl.cc @@ -9,8 +9,6 @@ #include "base/command_line.h" #include "base/json/json_writer.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/sequenced_task_runner.h" #include "base/sys_info.h" #include "base/task_runner_util.h" @@ -19,6 +17,8 @@ #include "chromeos/dbus/dbus_method_call_status.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/session_manager_client.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" namespace arc { diff --git a/components/autofill/DEPS b/components/autofill/DEPS index dd9ecc3e3bc355..bed4f0afd3c310 100644 --- a/components/autofill/DEPS +++ b/components/autofill/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+components/prefs", "+google_apis/gaia/gaia_urls.h", "+grit", # For generated headers "+jni", diff --git a/components/autofill/core/browser/autocomplete_history_manager.cc b/components/autofill/core/browser/autocomplete_history_manager.cc index 013bbaca4e783c..3a6805b2faee44 100644 --- a/components/autofill/core/browser/autocomplete_history_manager.cc +++ b/components/autofill/core/browser/autocomplete_history_manager.cc @@ -6,7 +6,6 @@ #include -#include "base/prefs/pref_service.h" #include "base/profiler/scoped_tracker.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" @@ -18,6 +17,7 @@ #include "components/autofill/core/browser/validation.h" #include "components/autofill/core/common/autofill_pref_names.h" #include "components/autofill/core/common/form_data.h" +#include "components/prefs/pref_service.h" namespace autofill { namespace { diff --git a/components/autofill/core/browser/autocomplete_history_manager.h b/components/autofill/core/browser/autocomplete_history_manager.h index b76f10af998b62..7acafda7a914b2 100644 --- a/components/autofill/core/browser/autocomplete_history_manager.h +++ b/components/autofill/core/browser/autocomplete_history_manager.h @@ -8,8 +8,8 @@ #include #include "base/macros.h" -#include "base/prefs/pref_member.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" +#include "components/prefs/pref_member.h" #include "components/webdata/common/web_data_service_consumer.h" namespace autofill { diff --git a/components/metrics/DEPS b/components/metrics/DEPS index 8657acbdfd3fbb..2898844b5507e7 100644 --- a/components/metrics/DEPS +++ b/components/metrics/DEPS @@ -4,6 +4,7 @@ include_rules = [ "-components", "+components/compression", "+components/metrics", + "+components/prefs", "+components/variations", "+components/version_info", "+third_party/zlib/google", diff --git a/components/metrics/metrics_log_manager_unittest.cc b/components/metrics/metrics_log_manager_unittest.cc index 9204d854051375..c35d10043b7a54 100644 --- a/components/metrics/metrics_log_manager_unittest.cc +++ b/components/metrics/metrics_log_manager_unittest.cc @@ -10,11 +10,11 @@ #include #include -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "components/metrics/metrics_log.h" #include "components/metrics/metrics_pref_names.h" #include "components/metrics/test_metrics_service_client.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace metrics { diff --git a/components/metrics/metrics_log_unittest.cc b/components/metrics/metrics_log_unittest.cc index c246e5cca51414..5154cd73ecbb5f 100644 --- a/components/metrics/metrics_log_unittest.cc +++ b/components/metrics/metrics_log_unittest.cc @@ -14,8 +14,6 @@ #include "base/memory/scoped_vector.h" #include "base/metrics/bucket_ranges.h" #include "base/metrics/sample_vector.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/testing_pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" #include "components/metrics/metrics_pref_names.h" @@ -23,6 +21,8 @@ #include "components/metrics/proto/chrome_user_metrics_extension.pb.h" #include "components/metrics/test_metrics_provider.h" #include "components/metrics/test_metrics_service_client.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "components/variations/active_field_trials.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/metrics/metrics_service.cc b/components/metrics/metrics_service.cc index 98c1456b3c6a93..a69d8e82c1abc1 100644 --- a/components/metrics/metrics_service.cc +++ b/components/metrics/metrics_service.cc @@ -137,8 +137,6 @@ #include "base/metrics/histogram_samples.h" #include "base/metrics/sparse_histogram.h" #include "base/metrics/statistics_recorder.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" @@ -158,6 +156,8 @@ #include "components/metrics/metrics_reporting_scheduler.h" #include "components/metrics/metrics_service_client.h" #include "components/metrics/metrics_state_manager.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/variations/entropy_provider.h" #include "components/variations/variations_associated_data.h" diff --git a/components/metrics/metrics_service_accessor.cc b/components/metrics/metrics_service_accessor.cc index ce301c9bb14523..ac04ba9884d0c8 100644 --- a/components/metrics/metrics_service_accessor.cc +++ b/components/metrics/metrics_service_accessor.cc @@ -6,9 +6,9 @@ #include "base/base_switches.h" #include "base/command_line.h" -#include "base/prefs/pref_service.h" #include "components/metrics/metrics_pref_names.h" #include "components/metrics/metrics_service.h" +#include "components/prefs/pref_service.h" #include "components/variations/metrics_util.h" namespace metrics { diff --git a/components/metrics/metrics_service_unittest.cc b/components/metrics/metrics_service_unittest.cc index e6511b16a13b07..9b734c1a1550c4 100644 --- a/components/metrics/metrics_service_unittest.cc +++ b/components/metrics/metrics_service_unittest.cc @@ -14,7 +14,6 @@ #include "base/message_loop/message_loop.h" #include "base/metrics/metrics_hashes.h" #include "base/metrics/statistics_recorder.h" -#include "base/prefs/testing_pref_service.h" #include "base/threading/platform_thread.h" #include "components/metrics/client_info.h" #include "components/metrics/metrics_log.h" @@ -22,6 +21,7 @@ #include "components/metrics/metrics_state_manager.h" #include "components/metrics/test_metrics_provider.h" #include "components/metrics/test_metrics_service_client.h" +#include "components/prefs/testing_pref_service.h" #include "components/variations/metrics_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/zlib/google/compression_utils.h" diff --git a/components/metrics/metrics_state_manager.cc b/components/metrics/metrics_state_manager.cc index b7e224c53c4bcd..1050a0bcb51389 100644 --- a/components/metrics/metrics_state_manager.cc +++ b/components/metrics/metrics_state_manager.cc @@ -10,8 +10,6 @@ #include "base/guid.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "base/threading/thread_restrictions.h" @@ -21,6 +19,8 @@ #include "components/metrics/machine_id_provider.h" #include "components/metrics/metrics_pref_names.h" #include "components/metrics/metrics_switches.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/variations/caching_permuted_entropy_provider.h" namespace metrics { diff --git a/components/metrics/metrics_state_manager_unittest.cc b/components/metrics/metrics_state_manager_unittest.cc index 609b2985ff06b3..72280aea534933 100644 --- a/components/metrics/metrics_state_manager_unittest.cc +++ b/components/metrics/metrics_state_manager_unittest.cc @@ -13,11 +13,11 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/macros.h" -#include "base/prefs/testing_pref_service.h" #include "components/metrics/client_info.h" #include "components/metrics/metrics_pref_names.h" #include "components/metrics/metrics_service.h" #include "components/metrics/metrics_switches.h" +#include "components/prefs/testing_pref_service.h" #include "components/variations/caching_permuted_entropy_provider.h" #include "components/variations/pref_names.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/metrics/persisted_logs.cc b/components/metrics/persisted_logs.cc index 8228e212897488..c78ecec2596b99 100644 --- a/components/metrics/persisted_logs.cc +++ b/components/metrics/persisted_logs.cc @@ -9,10 +9,10 @@ #include "base/base64.h" #include "base/md5.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/sha1.h" #include "base/timer/elapsed_timer.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "third_party/zlib/google/compression_utils.h" namespace metrics { diff --git a/components/metrics/persisted_logs_unittest.cc b/components/metrics/persisted_logs_unittest.cc index 5bd3b55e16af06..b4a79a73ea626e 100644 --- a/components/metrics/persisted_logs_unittest.cc +++ b/components/metrics/persisted_logs_unittest.cc @@ -8,12 +8,12 @@ #include "base/base64.h" #include "base/macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/scoped_user_pref_update.h" -#include "base/prefs/testing_pref_service.h" #include "base/rand_util.h" #include "base/sha1.h" #include "base/values.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/scoped_user_pref_update.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/zlib/google/compression_utils.h" diff --git a/components/metrics/stability_metrics_helper.cc b/components/metrics/stability_metrics_helper.cc index 1f863c06b76957..52b91f0f127d65 100644 --- a/components/metrics/stability_metrics_helper.cc +++ b/components/metrics/stability_metrics_helper.cc @@ -11,11 +11,11 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/metrics/sparse_histogram.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "components/metrics/metrics_pref_names.h" #include "components/metrics/proto/system_profile.pb.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #if defined(OS_WIN) #include // Needed for STATUS_* codes diff --git a/components/metrics/stability_metrics_helper_unittest.cc b/components/metrics/stability_metrics_helper_unittest.cc index 982c4ec1653876..6ca84df0f28d06 100644 --- a/components/metrics/stability_metrics_helper_unittest.cc +++ b/components/metrics/stability_metrics_helper_unittest.cc @@ -5,10 +5,10 @@ #include "components/metrics/stability_metrics_helper.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" -#include "base/prefs/testing_pref_service.h" #include "components/metrics/proto/system_profile.pb.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace metrics { diff --git a/components/network_time/DEPS b/components/network_time/DEPS new file mode 100644 index 00000000000000..eac076192dcda9 --- /dev/null +++ b/components/network_time/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+components/prefs", +] diff --git a/components/network_time/network_time_tracker.cc b/components/network_time/network_time_tracker.cc index 470a8e823836fe..8bee5aac911e7f 100644 --- a/components/network_time/network_time_tracker.cc +++ b/components/network_time/network_time_tracker.cc @@ -9,12 +9,12 @@ #include "base/i18n/time_formatting.h" #include "base/logging.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/time/tick_clock.h" #include "build/build_config.h" #include "components/network_time/network_time_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" namespace network_time { diff --git a/components/network_time/network_time_tracker_unittest.cc b/components/network_time/network_time_tracker_unittest.cc index c2133fd862c7ac..f86149be84330b 100644 --- a/components/network_time/network_time_tracker_unittest.cc +++ b/components/network_time/network_time_tracker_unittest.cc @@ -8,8 +8,8 @@ #include #include "base/compiler_specific.h" -#include "base/prefs/testing_pref_service.h" #include "base/time/tick_clock.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace network_time { diff --git a/components/omnibox/browser/DEPS b/components/omnibox/browser/DEPS index 5b290eecf18a0b..8c5d335ee5f622 100644 --- a/components/omnibox/browser/DEPS +++ b/components/omnibox/browser/DEPS @@ -8,6 +8,7 @@ include_rules = [ "+components/metrics", "+components/open_from_clipboard", "+components/pref_registry", + "+components/prefs", "+components/query_parser", "+components/search", "+components/search_engines", diff --git a/components/omnibox/browser/bookmark_provider.cc b/components/omnibox/browser/bookmark_provider.cc index 6c1c3857f96118..40d84018fbebb0 100644 --- a/components/omnibox/browser/bookmark_provider.cc +++ b/components/omnibox/browser/bookmark_provider.cc @@ -9,7 +9,6 @@ #include #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "components/bookmarks/browser/bookmark_match.h" @@ -19,6 +18,7 @@ #include "components/omnibox/browser/autocomplete_result.h" #include "components/omnibox/browser/history_provider.h" #include "components/omnibox/browser/url_prefix.h" +#include "components/prefs/pref_service.h" #include "components/url_formatter/url_formatter.h" #include "url/url_constants.h" diff --git a/components/omnibox/browser/history_quick_provider.cc b/components/omnibox/browser/history_quick_provider.cc index 59998aa205c0d4..438efb93615a6d 100644 --- a/components/omnibox/browser/history_quick_provider.cc +++ b/components/omnibox/browser/history_quick_provider.cc @@ -11,7 +11,6 @@ #include "base/i18n/break_iterator.h" #include "base/logging.h" #include "base/metrics/field_trial.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -27,6 +26,7 @@ #include "components/omnibox/browser/in_memory_url_index_types.h" #include "components/omnibox/browser/omnibox_field_trial.h" #include "components/omnibox/browser/url_prefix.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "components/url_formatter/url_formatter.h" diff --git a/components/omnibox/browser/history_quick_provider_unittest.cc b/components/omnibox/browser/history_quick_provider_unittest.cc index 8531c0e566d800..666138c7996971 100644 --- a/components/omnibox/browser/history_quick_provider_unittest.cc +++ b/components/omnibox/browser/history_quick_provider_unittest.cc @@ -17,7 +17,6 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/test/sequenced_worker_pool_owner.h" @@ -39,6 +38,7 @@ #include "components/omnibox/browser/mock_autocomplete_provider_client.h" #include "components/omnibox/browser/test_scheme_classifier.h" #include "components/omnibox/browser/url_index_private_data.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" diff --git a/components/omnibox/browser/history_url_provider.cc b/components/omnibox/browser/history_url_provider.cc index a7a4b0147639dc..9361023e1d7590 100644 --- a/components/omnibox/browser/history_url_provider.cc +++ b/components/omnibox/browser/history_url_provider.cc @@ -12,7 +12,6 @@ #include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -30,6 +29,7 @@ #include "components/omnibox/browser/omnibox_field_trial.h" #include "components/omnibox/browser/scored_history_match.h" #include "components/omnibox/browser/url_prefix.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url_service.h" #include "components/url_formatter/url_fixer.h" diff --git a/components/omnibox/browser/history_url_provider_unittest.cc b/components/omnibox/browser/history_url_provider_unittest.cc index c75618e1411da6..8dcb8d66adc9ec 100644 --- a/components/omnibox/browser/history_url_provider_unittest.cc +++ b/components/omnibox/browser/history_url_provider_unittest.cc @@ -12,7 +12,6 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" @@ -28,6 +27,7 @@ #include "components/omnibox/browser/history_quick_provider.h" #include "components/omnibox/browser/mock_autocomplete_provider_client.h" #include "components/omnibox/browser/test_scheme_classifier.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/default_search_manager.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url.h" diff --git a/components/omnibox/browser/shortcuts_provider.cc b/components/omnibox/browser/shortcuts_provider.cc index dcea1d29404963..55cab0e8bb5b7c 100644 --- a/components/omnibox/browser/shortcuts_provider.cc +++ b/components/omnibox/browser/shortcuts_provider.cc @@ -15,7 +15,6 @@ #include "base/i18n/case_conversion.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -30,6 +29,7 @@ #include "components/omnibox/browser/history_provider.h" #include "components/omnibox/browser/omnibox_field_trial.h" #include "components/omnibox/browser/url_prefix.h" +#include "components/prefs/pref_service.h" #include "components/url_formatter/url_fixer.h" #include "url/third_party/mozilla/url_parse.h" diff --git a/components/omnibox/browser/zero_suggest_provider.cc b/components/omnibox/browser/zero_suggest_provider.cc index e1f7be78915bd2..956c245276e029 100644 --- a/components/omnibox/browser/zero_suggest_provider.cc +++ b/components/omnibox/browser/zero_suggest_provider.cc @@ -11,7 +11,6 @@ #include "base/json/json_string_value_serializer.h" #include "base/metrics/histogram.h" #include "base/metrics/user_metrics.h" -#include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -30,6 +29,7 @@ #include "components/omnibox/browser/search_provider.h" #include "components/omnibox/browser/verbatim_match.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/template_url_service.h" #include "components/url_formatter/url_formatter.h" #include "components/variations/net/variations_http_headers.h" diff --git a/components/omnibox/browser/zero_suggest_provider_unittest.cc b/components/omnibox/browser/zero_suggest_provider_unittest.cc index 8771794e405a4a..e198556cb3cec4 100644 --- a/components/omnibox/browser/zero_suggest_provider_unittest.cc +++ b/components/omnibox/browser/zero_suggest_provider_unittest.cc @@ -5,8 +5,6 @@ #include "components/omnibox/browser/zero_suggest_provider.h" #include "base/metrics/field_trial.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "components/history/core/browser/top_sites.h" @@ -16,6 +14,8 @@ #include "components/omnibox/browser/omnibox_field_trial.h" #include "components/omnibox/browser/omnibox_pref_names.h" #include "components/omnibox/browser/test_scheme_classifier.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "components/variations/entropy_provider.h" diff --git a/components/password_manager/DEPS b/components/password_manager/DEPS index 8c2766ecc85db3..273714ca3aa3f3 100644 --- a/components/password_manager/DEPS +++ b/components/password_manager/DEPS @@ -2,6 +2,7 @@ include_rules = [ "+components/autofill/core/common", "+components/os_crypt", "+components/password_manager/core", + "+components/prefs", "+components/strings/grit", "+net/base", "+net/http/http_status_code.h", diff --git a/components/password_manager/content/browser/credential_manager_dispatcher.h b/components/password_manager/content/browser/credential_manager_dispatcher.h index 88712342a7562e..3093293d03bce6 100644 --- a/components/password_manager/content/browser/credential_manager_dispatcher.h +++ b/components/password_manager/content/browser/credential_manager_dispatcher.h @@ -9,11 +9,11 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_member.h" #include "components/password_manager/core/browser/credential_manager_password_form_manager.h" #include "components/password_manager/core/browser/credential_manager_pending_request_task.h" #include "components/password_manager/core/browser/credential_manager_pending_require_user_mediation_task.h" #include "components/password_manager/core/browser/password_store_consumer.h" +#include "components/prefs/pref_member.h" #include "content/public/browser/web_contents_observer.h" class GURL; diff --git a/components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc b/components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc index be30713a8018e9..60dfbed39aea63 100644 --- a/components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc +++ b/components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc @@ -12,8 +12,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" @@ -27,6 +25,8 @@ #include "components/password_manager/core/browser/test_password_store.h" #include "components/password_manager/core/common/credential_manager_types.h" #include "components/password_manager/core/common/password_manager_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "content/public/browser/web_contents.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_renderer_host.h" diff --git a/components/password_manager/core/browser/password_bubble_experiment.cc b/components/password_manager/core/browser/password_bubble_experiment.cc index f903a2ba620265..204f09af04fdd6 100644 --- a/components/password_manager/core/browser/password_bubble_experiment.cc +++ b/components/password_manager/core/browser/password_bubble_experiment.cc @@ -7,11 +7,11 @@ #include #include "base/metrics/field_trial.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "components/password_manager/core/browser/password_manager_util.h" #include "components/password_manager/core/common/password_manager_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/variations/variations_associated_data.h" namespace password_bubble_experiment { diff --git a/components/password_manager/core/browser/password_bubble_experiment_unittest.cc b/components/password_manager/core/browser/password_bubble_experiment_unittest.cc index 54c23b6562a911..4e21edb108b642 100644 --- a/components/password_manager/core/browser/password_bubble_experiment_unittest.cc +++ b/components/password_manager/core/browser/password_bubble_experiment_unittest.cc @@ -7,10 +7,10 @@ #include #include "base/metrics/field_trial.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/testing_pref_service.h" #include "components/password_manager/core/common/password_manager_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "components/sync_driver/fake_sync_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/password_manager/core/browser/password_form_manager_unittest.cc b/components/password_manager/core/browser/password_form_manager_unittest.cc index 1d94403ba44daa..56cc1987c86312 100644 --- a/components/password_manager/core/browser/password_form_manager_unittest.cc +++ b/components/password_manager/core/browser/password_form_manager_unittest.cc @@ -9,9 +9,6 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/histogram_tester.h" @@ -33,6 +30,9 @@ #include "components/password_manager/core/browser/stub_password_manager_client.h" #include "components/password_manager/core/browser/stub_password_manager_driver.h" #include "components/password_manager/core/common/password_manager_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/password_manager/core/browser/password_generation_manager_unittest.cc b/components/password_manager/core/browser/password_generation_manager_unittest.cc index 38a68a615c3a15..a3fb762408142a 100644 --- a/components/password_manager/core/browser/password_generation_manager_unittest.cc +++ b/components/password_manager/core/browser/password_generation_manager_unittest.cc @@ -8,9 +8,6 @@ #include #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/testing_pref_service.h" #include "base/strings/utf_string_conversions.h" #include "components/autofill/core/browser/autofill_field.h" #include "components/autofill/core/browser/autofill_metrics.h" @@ -24,6 +21,9 @@ #include "components/password_manager/core/browser/stub_password_manager_driver.h" #include "components/password_manager/core/browser/test_password_store.h" #include "components/password_manager/core/common/password_manager_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc index 4b9ae60d4d2d73..02da27ff0ca042 100644 --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc @@ -11,7 +11,6 @@ #include "base/command_line.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/platform_thread.h" @@ -33,10 +32,11 @@ #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/password_manager/core/common/password_manager_switches.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #if defined(OS_WIN) -#include "base/prefs/pref_registry_simple.h" +#include "components/prefs/pref_registry_simple.h" #endif using autofill::PasswordForm; diff --git a/components/password_manager/core/browser/password_manager_metrics_util.cc b/components/password_manager/core/browser/password_manager_metrics_util.cc index a870a1d0532139..5e4c0c6d49159f 100644 --- a/components/password_manager/core/browser/password_manager_metrics_util.cc +++ b/components/password_manager/core/browser/password_manager_metrics_util.cc @@ -7,14 +7,14 @@ #include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/time/time.h" #include "base/values.h" #include "components/password_manager/core/common/password_manager_pref_names.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "url/gurl.h" using base::ListValue; diff --git a/components/password_manager/core/browser/password_manager_metrics_util_unittest.cc b/components/password_manager/core/browser/password_manager_metrics_util_unittest.cc index da7b44a9c4b708..8efb55d5fb80c8 100644 --- a/components/password_manager/core/browser/password_manager_metrics_util_unittest.cc +++ b/components/password_manager/core/browser/password_manager_metrics_util_unittest.cc @@ -9,11 +9,11 @@ #include #include "base/macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/scoped_user_pref_update.h" -#include "base/prefs/testing_pref_service.h" #include "base/values.h" #include "components/password_manager/core/common/password_manager_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/scoped_user_pref_update.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace password_manager { diff --git a/components/password_manager/core/browser/password_store_default.cc b/components/password_manager/core/browser/password_store_default.cc index 30861b18182519..c63ac27b32b309 100644 --- a/components/password_manager/core/browser/password_store_default.cc +++ b/components/password_manager/core/browser/password_store_default.cc @@ -8,9 +8,9 @@ #include #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "components/password_manager/core/browser/password_store_change.h" +#include "components/prefs/pref_service.h" #include "url/origin.h" using autofill::PasswordForm; diff --git a/components/password_manager/core/browser/password_store_default_unittest.cc b/components/password_manager/core/browser/password_store_default_unittest.cc index 9c05f7435ed9a1..fefeba0258fdf0 100644 --- a/components/password_manager/core/browser/password_store_default_unittest.cc +++ b/components/password_manager/core/browser/password_store_default_unittest.cc @@ -11,7 +11,6 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/string_util.h" @@ -22,6 +21,7 @@ #include "components/password_manager/core/browser/password_store_change.h" #include "components/password_manager/core/browser/password_store_consumer.h" #include "components/password_manager/core/browser/password_store_origin_unittest.h" +#include "components/prefs/pref_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/origin.h" diff --git a/components/password_manager/sync/browser/password_manager_setting_migrator_service.h b/components/password_manager/sync/browser/password_manager_setting_migrator_service.h index 4b1476d43fd353..2cd4cda42696e0 100644 --- a/components/password_manager/sync/browser/password_manager_setting_migrator_service.h +++ b/components/password_manager/sync/browser/password_manager_setting_migrator_service.h @@ -9,8 +9,8 @@ #include "base/macros.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_change_registrar.h" #include "components/keyed_service/core/keyed_service.h" +#include "components/prefs/pref_change_registrar.h" #include "components/syncable_prefs/pref_service_syncable_observer.h" namespace sync_driver { diff --git a/components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc b/components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc index 7dc8671af3c95e..889506b94c75d7 100644 --- a/components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc +++ b/components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc @@ -5,7 +5,6 @@ #include "base/json/json_writer.h" #include "base/macros.h" #include "base/metrics/field_trial.h" -#include "base/prefs/pref_service.h" #include "base/test/histogram_tester.h" #include "base/values.h" #include "build/build_config.h" @@ -13,6 +12,7 @@ #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/password_manager/sync/browser/password_manager_setting_migrator_service.h" #include "components/pref_registry/testing_pref_service_syncable.h" +#include "components/prefs/pref_service.h" #include "components/sync_driver/fake_sync_service.h" #include "components/syncable_prefs/pref_model_associator_client.h" #include "components/syncable_prefs/pref_service_mock_factory.h" diff --git a/components/policy/core/DEPS b/components/policy/core/DEPS index 86fa8989b249e7..3fb7eb3d27fc66 100644 --- a/components/policy/core/DEPS +++ b/components/policy/core/DEPS @@ -1,5 +1,6 @@ include_rules = [ "+components/json_schema", + "+components/prefs", "+crypto", "+google_apis", "+net", diff --git a/components/policy/core/browser/autofill_policy_handler.cc b/components/policy/core/browser/autofill_policy_handler.cc index f70fe4083953fe..986a0904c5b3d0 100644 --- a/components/policy/core/browser/autofill_policy_handler.cc +++ b/components/policy/core/browser/autofill_policy_handler.cc @@ -4,10 +4,10 @@ #include "components/policy/core/browser/autofill_policy_handler.h" -#include "base/prefs/pref_value_map.h" #include "base/values.h" #include "components/autofill/core/common/autofill_pref_names.h" #include "components/policy/core/common/policy_map.h" +#include "components/prefs/pref_value_map.h" #include "policy/policy_constants.h" namespace policy { diff --git a/components/policy/core/browser/autofill_policy_handler_unittest.cc b/components/policy/core/browser/autofill_policy_handler_unittest.cc index aa457c5af3fcae..4db22478365b68 100644 --- a/components/policy/core/browser/autofill_policy_handler_unittest.cc +++ b/components/policy/core/browser/autofill_policy_handler_unittest.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/pref_value_map.h" #include "base/values.h" #include "components/autofill/core/common/autofill_pref_names.h" #include "components/policy/core/browser/autofill_policy_handler.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_types.h" +#include "components/prefs/pref_value_map.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/policy/core/browser/browser_policy_connector.cc b/components/policy/core/browser/browser_policy_connector.cc index a043fe1152d5a9..f4908c033cad2c 100644 --- a/components/policy/core/browser/browser_policy_connector.cc +++ b/components/policy/core/browser/browser_policy_connector.cc @@ -14,7 +14,6 @@ #include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" -#include "base/prefs/pref_registry_simple.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h" @@ -24,6 +23,7 @@ #include "components/policy/core/common/policy_pref_names.h" #include "components/policy/core/common/policy_statistics_collector.h" #include "components/policy/core/common/policy_switches.h" +#include "components/prefs/pref_registry_simple.h" #include "google_apis/gaia/gaia_auth_util.h" #include "policy/policy_constants.h" #include "third_party/icu/source/i18n/unicode/regex.h" diff --git a/components/policy/core/browser/configuration_policy_handler.cc b/components/policy/core/browser/configuration_policy_handler.cc index fff61fe633c59a..a1d62f8e0f2e8f 100644 --- a/components/policy/core/browser/configuration_policy_handler.cc +++ b/components/policy/core/browser/configuration_policy_handler.cc @@ -12,12 +12,12 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/macros.h" -#include "base/prefs/pref_value_map.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" +#include "components/prefs/pref_value_map.h" #include "grit/components_strings.h" #include "url/gurl.h" diff --git a/components/policy/core/browser/configuration_policy_handler_list.cc b/components/policy/core/browser/configuration_policy_handler_list.cc index b6f236c19dc4ab..14048383d535a1 100644 --- a/components/policy/core/browser/configuration_policy_handler_list.cc +++ b/components/policy/core/browser/configuration_policy_handler_list.cc @@ -4,12 +4,12 @@ #include "components/policy/core/browser/configuration_policy_handler_list.h" -#include "base/prefs/pref_value_map.h" #include "base/stl_util.h" #include "components/policy/core/browser/configuration_policy_handler.h" #include "components/policy/core/browser/configuration_policy_handler_parameters.h" #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" +#include "components/prefs/pref_value_map.h" #include "grit/components_strings.h" namespace policy { diff --git a/components/policy/core/browser/configuration_policy_handler_unittest.cc b/components/policy/core/browser/configuration_policy_handler_unittest.cc index 57db6d6fedd76d..3e508c4895d73a 100644 --- a/components/policy/core/browser/configuration_policy_handler_unittest.cc +++ b/components/policy/core/browser/configuration_policy_handler_unittest.cc @@ -6,13 +6,13 @@ #include "base/callback.h" #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_value_map.h" #include "base/values.h" #include "components/policy/core/browser/configuration_policy_handler.h" #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/schema.h" +#include "components/prefs/pref_value_map.h" #include "testing/gtest/include/gtest/gtest.h" namespace policy { diff --git a/components/policy/core/browser/configuration_policy_pref_store.cc b/components/policy/core/browser/configuration_policy_pref_store.cc index dc62a70a2f43fc..70fe24642199d1 100644 --- a/components/policy/core/browser/configuration_policy_pref_store.cc +++ b/components/policy/core/browser/configuration_policy_pref_store.cc @@ -10,13 +10,13 @@ #include "base/bind.h" #include "base/location.h" #include "base/logging.h" -#include "base/prefs/pref_value_map.h" #include "base/single_thread_task_runner.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" #include "components/policy/core/browser/configuration_policy_handler_list.h" #include "components/policy/core/browser/policy_error_map.h" +#include "components/prefs/pref_value_map.h" namespace policy { diff --git a/components/policy/core/browser/configuration_policy_pref_store.h b/components/policy/core/browser/configuration_policy_pref_store.h index df5da5351214ca..a410427bb6c65c 100644 --- a/components/policy/core/browser/configuration_policy_pref_store.h +++ b/components/policy/core/browser/configuration_policy_pref_store.h @@ -10,12 +10,12 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/pref_store.h" #include "base/values.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_service.h" #include "components/policy/core/common/policy_types.h" #include "components/policy/policy_export.h" +#include "components/prefs/pref_store.h" class PrefValueMap; diff --git a/components/policy/core/browser/configuration_policy_pref_store_unittest.cc b/components/policy/core/browser/configuration_policy_pref_store_unittest.cc index d4b2599f8840ac..68e84d37547039 100644 --- a/components/policy/core/browser/configuration_policy_pref_store_unittest.cc +++ b/components/policy/core/browser/configuration_policy_pref_store_unittest.cc @@ -6,7 +6,6 @@ #include "base/callback.h" #include "base/files/file_path.h" -#include "base/prefs/pref_store_observer_mock.h" #include "base/run_loop.h" #include "components/policy/core/browser/configuration_policy_handler.h" #include "components/policy/core/browser/configuration_policy_pref_store.h" @@ -17,6 +16,7 @@ #include "components/policy/core/common/policy_pref_names.h" #include "components/policy/core/common/policy_service_impl.h" #include "components/policy/core/common/policy_types.h" +#include "components/prefs/pref_store_observer_mock.h" #include "testing/gmock/include/gmock/gmock.h" // Note: this file should move to components/policy/core/browser, but the diff --git a/components/policy/core/browser/proxy_policy_handler.cc b/components/policy/core/browser/proxy_policy_handler.cc index d6dfc75b8983f8..dd943c49b99fa3 100644 --- a/components/policy/core/browser/proxy_policy_handler.cc +++ b/components/policy/core/browser/proxy_policy_handler.cc @@ -8,12 +8,12 @@ #include "base/logging.h" #include "base/macros.h" -#include "base/prefs/pref_value_map.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "components/policy/core/browser/configuration_policy_handler.h" #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" +#include "components/prefs/pref_value_map.h" #include "components/proxy_config/proxy_config_dictionary.h" #include "components/proxy_config/proxy_config_pref_names.h" #include "grit/components_strings.h" diff --git a/components/policy/core/browser/url_blacklist_manager.cc b/components/policy/core/browser/url_blacklist_manager.cc index ffc8dacb602d86..04962918afdfb6 100644 --- a/components/policy/core/browser/url_blacklist_manager.cc +++ b/components/policy/core/browser/url_blacklist_manager.cc @@ -12,7 +12,6 @@ #include "base/files/file_path.h" #include "base/location.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" @@ -22,6 +21,7 @@ #include "base/values.h" #include "components/policy/core/common/policy_pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "net/base/filename_util.h" #include "net/base/net_errors.h" #include "url/third_party/mozilla/url_parse.h" diff --git a/components/policy/core/browser/url_blacklist_manager.h b/components/policy/core/browser/url_blacklist_manager.h index 23e6734db64a99..2f081ec9271ee0 100644 --- a/components/policy/core/browser/url_blacklist_manager.h +++ b/components/policy/core/browser/url_blacklist_manager.h @@ -18,8 +18,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_change_registrar.h" #include "components/policy/policy_export.h" +#include "components/prefs/pref_change_registrar.h" #include "components/url_matcher/url_matcher.h" #include "url/gurl.h" diff --git a/components/policy/core/browser/url_blacklist_manager_unittest.cc b/components/policy/core/browser/url_blacklist_manager_unittest.cc index 5e6e7f5fdad3f6..5b56c8b7bbe78f 100644 --- a/components/policy/core/browser/url_blacklist_manager_unittest.cc +++ b/components/policy/core/browser/url_blacklist_manager_unittest.cc @@ -12,10 +12,10 @@ #include "base/callback.h" #include "base/macros.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/thread_task_runner_handle.h" #include "components/policy/core/common/policy_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "components/url_formatter/url_fixer.h" #include "google_apis/gaia/gaia_urls.h" #include "net/base/load_flags.h" diff --git a/components/policy/core/browser/url_blacklist_policy_handler.cc b/components/policy/core/browser/url_blacklist_policy_handler.cc index 6bfa20e8bc4e82..51270ba3f634a7 100644 --- a/components/policy/core/browser/url_blacklist_policy_handler.cc +++ b/components/policy/core/browser/url_blacklist_policy_handler.cc @@ -7,11 +7,11 @@ #include #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_value_map.h" #include "base/values.h" #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_pref_names.h" +#include "components/prefs/pref_value_map.h" #include "grit/components_strings.h" #include "policy/policy_constants.h" diff --git a/components/policy/core/browser/url_blacklist_policy_handler_unittest.cc b/components/policy/core/browser/url_blacklist_policy_handler_unittest.cc index d0740a7de9745f..8296ab7e2b1e1f 100644 --- a/components/policy/core/browser/url_blacklist_policy_handler_unittest.cc +++ b/components/policy/core/browser/url_blacklist_policy_handler_unittest.cc @@ -3,13 +3,13 @@ // found in the LICENSE file. #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_value_map.h" #include "base/values.h" #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/browser/url_blacklist_policy_handler.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_pref_names.h" #include "components/policy/core/common/policy_types.h" +#include "components/prefs/pref_value_map.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/policy/core/common/cloud/cloud_policy_core.cc b/components/policy/core/common/cloud/cloud_policy_core.cc index fd8e9efe471d29..956497dda5bfdb 100644 --- a/components/policy/core/common/cloud/cloud_policy_core.cc +++ b/components/policy/core/common/cloud/cloud_policy_core.cc @@ -9,13 +9,13 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "components/policy/core/common/cloud/cloud_policy_client.h" #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h" #include "components/policy/core/common/cloud/cloud_policy_service.h" #include "components/policy/core/common/cloud/cloud_policy_store.h" #include "components/policy/core/common/remote_commands/remote_commands_factory.h" #include "components/policy/core/common/remote_commands/remote_commands_service.h" +#include "components/prefs/pref_service.h" namespace policy { diff --git a/components/policy/core/common/cloud/cloud_policy_core.h b/components/policy/core/common/cloud/cloud_policy_core.h index ed026d2546b834..935dc047c683b3 100644 --- a/components/policy/core/common/cloud/cloud_policy_core.h +++ b/components/policy/core/common/cloud/cloud_policy_core.h @@ -11,8 +11,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/pref_member.h" #include "components/policy/policy_export.h" +#include "components/prefs/pref_member.h" class PrefService; diff --git a/components/policy/core/common/cloud/cloud_policy_core_unittest.cc b/components/policy/core/common/cloud/cloud_policy_core_unittest.cc index d843af0bc2ad16..b6fdea566d39cb 100644 --- a/components/policy/core/common/cloud/cloud_policy_core_unittest.cc +++ b/components/policy/core/common/cloud/cloud_policy_core_unittest.cc @@ -5,13 +5,13 @@ #include "components/policy/core/common/cloud/cloud_policy_core.h" #include "base/macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h" #include "components/policy/core/common/cloud/mock_cloud_policy_client.h" #include "components/policy/core/common/cloud/mock_cloud_policy_store.h" #include "components/policy/core/common/policy_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace policy { diff --git a/components/policy/core/common/cloud/cloud_policy_manager.cc b/components/policy/core/common/cloud/cloud_policy_manager.cc index db6a3ec2da9a3e..bfe95ea3e075be 100644 --- a/components/policy/core/common/cloud/cloud_policy_manager.cc +++ b/components/policy/core/common/cloud/cloud_policy_manager.cc @@ -11,12 +11,12 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "components/policy/core/common/cloud/cloud_policy_service.h" #include "components/policy/core/common/policy_bundle.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_switches.h" +#include "components/prefs/pref_service.h" #include "net/url_request/url_request_context_getter.h" #if !defined(OS_ANDROID) && !defined(OS_IOS) diff --git a/components/policy/core/common/cloud/cloud_policy_manager.h b/components/policy/core/common/cloud/cloud_policy_manager.h index b95c16ee0bd471..04d3076fe9b61e 100644 --- a/components/policy/core/common/cloud/cloud_policy_manager.h +++ b/components/policy/core/common/cloud/cloud_policy_manager.h @@ -11,12 +11,12 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_member.h" #include "components/policy/core/common/cloud/cloud_policy_core.h" #include "components/policy/core/common/cloud/cloud_policy_store.h" #include "components/policy/core/common/cloud/component_cloud_policy_service.h" #include "components/policy/core/common/configuration_policy_provider.h" #include "components/policy/policy_export.h" +#include "components/prefs/pref_member.h" namespace base { class FilePath; diff --git a/components/policy/core/common/policy_statistics_collector.cc b/components/policy/core/common/policy_statistics_collector.cc index 3e6a5880a03f12..f6746f2b811f33 100644 --- a/components/policy/core/common/policy_statistics_collector.cc +++ b/components/policy/core/common/policy_statistics_collector.cc @@ -12,11 +12,11 @@ #include "base/location.h" #include "base/logging.h" #include "base/metrics/sparse_histogram.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/task_runner.h" #include "components/policy/core/common/policy_pref_names.h" #include "components/policy/core/common/policy_service.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" namespace policy { diff --git a/components/policy/core/common/policy_statistics_collector_unittest.cc b/components/policy/core/common/policy_statistics_collector_unittest.cc index 6d5a0c2e8f4a6e..85ce9415ef8388 100644 --- a/components/policy/core/common/policy_statistics_collector_unittest.cc +++ b/components/policy/core/common/policy_statistics_collector_unittest.cc @@ -8,8 +8,6 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/test/test_simple_task_runner.h" #include "base/values.h" #include "components/policy/core/common/external_data_fetcher.h" @@ -19,6 +17,8 @@ #include "components/policy/core/common/policy_statistics_collector.h" #include "components/policy/core/common/policy_test_utils.h" #include "components/policy/core/common/policy_types.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/precache/DEPS b/components/precache/DEPS index e8a01acd302cb4..81775b5e6f02a4 100644 --- a/components/precache/DEPS +++ b/components/precache/DEPS @@ -6,4 +6,5 @@ include_rules = [ "+components/precache/core", "+components/history/core/browser", + "+components/prefs", ] diff --git a/components/precache/content/precache_manager.cc b/components/precache/content/precache_manager.cc index d38db70ebf1f3e..cf0baeaf3f5ce0 100644 --- a/components/precache/content/precache_manager.cc +++ b/components/precache/content/precache_manager.cc @@ -13,12 +13,12 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/field_trial.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/time/time.h" #include "components/history/core/browser/history_service.h" #include "components/precache/core/precache_database.h" #include "components/precache/core/precache_switches.h" +#include "components/prefs/pref_service.h" #include "components/sync_driver/sync_service.h" #include "components/variations/variations_associated_data.h" #include "content/public/browser/browser_context.h" diff --git a/components/pref_registry/DEPS b/components/pref_registry/DEPS index e7cf2c6ff61a3f..48dd821c9bd915 100644 --- a/components/pref_registry/DEPS +++ b/components/pref_registry/DEPS @@ -1,3 +1,4 @@ include_rules = [ + "+components/prefs", "+ui/base", ] diff --git a/components/pref_registry/pref_registry_syncable.cc b/components/pref_registry/pref_registry_syncable.cc index ce15ea0debeefa..a81cea05a8a6a6 100644 --- a/components/pref_registry/pref_registry_syncable.cc +++ b/components/pref_registry/pref_registry_syncable.cc @@ -5,9 +5,9 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "base/files/file_path.h" -#include "base/prefs/default_pref_store.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" +#include "components/prefs/default_pref_store.h" namespace user_prefs { diff --git a/components/pref_registry/pref_registry_syncable.h b/components/pref_registry/pref_registry_syncable.h index 88c3b01964b99b..cc3e6b05227121 100644 --- a/components/pref_registry/pref_registry_syncable.h +++ b/components/pref_registry/pref_registry_syncable.h @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/macros.h" -#include "base/prefs/pref_registry_simple.h" +#include "components/prefs/pref_registry_simple.h" namespace base { class DictionaryValue; diff --git a/components/pref_registry/testing_pref_service_syncable.cc b/components/pref_registry/testing_pref_service_syncable.cc index 22602936c69ce8..7595b2c8b8aa6f 100644 --- a/components/pref_registry/testing_pref_service_syncable.cc +++ b/components/pref_registry/testing_pref_service_syncable.cc @@ -5,9 +5,9 @@ #include "components/pref_registry/testing_pref_service_syncable.h" #include "base/bind.h" -#include "base/prefs/pref_notifier_impl.h" -#include "base/prefs/pref_value_store.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_notifier_impl.h" +#include "components/prefs/pref_value_store.h" template <> TestingPrefServiceBase:: diff --git a/components/pref_registry/testing_pref_service_syncable.h b/components/pref_registry/testing_pref_service_syncable.h index e20f9cb632c309..80a11a1f0203c0 100644 --- a/components/pref_registry/testing_pref_service_syncable.h +++ b/components/pref_registry/testing_pref_service_syncable.h @@ -6,7 +6,7 @@ #define COMPONENTS_PERF_REGISTRY_TESTING_PREF_SERVICE_SYNCABLE_H_ #include "base/macros.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" namespace user_prefs { diff --git a/components/prefs/default_pref_store.cc b/components/prefs/default_pref_store.cc index b08ef7a52866d2..79867e95774b43 100644 --- a/components/prefs/default_pref_store.cc +++ b/components/prefs/default_pref_store.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/default_pref_store.h" +#include "components/prefs/default_pref_store.h" #include diff --git a/components/prefs/default_pref_store.h b/components/prefs/default_pref_store.h index ac5364d2bb166e..af7306da5b4ea3 100644 --- a/components/prefs/default_pref_store.h +++ b/components/prefs/default_pref_store.h @@ -9,10 +9,10 @@ #include "base/macros.h" #include "base/observer_list.h" -#include "base/prefs/base_prefs_export.h" -#include "base/prefs/pref_store.h" -#include "base/prefs/pref_value_map.h" #include "base/values.h" +#include "components/prefs/base_prefs_export.h" +#include "components/prefs/pref_store.h" +#include "components/prefs/pref_value_map.h" // Used within a PrefRegistry to keep track of default preference values. class BASE_PREFS_EXPORT DefaultPrefStore : public PrefStore { diff --git a/components/prefs/default_pref_store_unittest.cc b/components/prefs/default_pref_store_unittest.cc index 597ca558a4f7ac..06cabc01b1471d 100644 --- a/components/prefs/default_pref_store_unittest.cc +++ b/components/prefs/default_pref_store_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/macros.h" -#include "base/prefs/default_pref_store.h" +#include "components/prefs/default_pref_store.h" #include "testing/gtest/include/gtest/gtest.h" using base::StringValue; diff --git a/components/prefs/json_pref_store.cc b/components/prefs/json_pref_store.cc index ffc750ed81b889..65b6f910652908 100644 --- a/components/prefs/json_pref_store.cc +++ b/components/prefs/json_pref_store.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/json_pref_store.h" +#include "components/prefs/json_pref_store.h" #include @@ -18,7 +18,6 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_filter.h" #include "base/sequenced_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -26,6 +25,7 @@ #include "base/threading/sequenced_worker_pool.h" #include "base/time/default_clock.h" #include "base/values.h" +#include "components/prefs/pref_filter.h" // Result returned from internal read tasks. struct JsonPrefStore::ReadResult { diff --git a/components/prefs/json_pref_store.h b/components/prefs/json_pref_store.h index 6342977f9ba2ab..30c1642a77fa93 100644 --- a/components/prefs/json_pref_store.h +++ b/components/prefs/json_pref_store.h @@ -19,9 +19,9 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "base/prefs/base_prefs_export.h" -#include "base/prefs/persistent_pref_store.h" #include "base/threading/non_thread_safe.h" +#include "components/prefs/base_prefs_export.h" +#include "components/prefs/persistent_pref_store.h" class PrefFilter; diff --git a/components/prefs/json_pref_store_unittest.cc b/components/prefs/json_pref_store_unittest.cc index bc9eecaace09bb..621b895a0e2438 100644 --- a/components/prefs/json_pref_store_unittest.cc +++ b/components/prefs/json_pref_store_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/json_pref_store.h" +#include "components/prefs/json_pref_store.h" #include @@ -18,7 +18,6 @@ #include "base/message_loop/message_loop.h" #include "base/metrics/histogram_samples.h" #include "base/path_service.h" -#include "base/prefs/pref_filter.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" @@ -29,6 +28,7 @@ #include "base/threading/sequenced_worker_pool.h" #include "base/threading/thread.h" #include "base/values.h" +#include "components/prefs/pref_filter.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/prefs/mock_pref_change_callback.cc b/components/prefs/mock_pref_change_callback.cc index 96b71974eb6ffd..7ac2cd78451ea1 100644 --- a/components/prefs/mock_pref_change_callback.cc +++ b/components/prefs/mock_pref_change_callback.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/mock_pref_change_callback.h" +#include "components/prefs/mock_pref_change_callback.h" #include "base/bind.h" diff --git a/components/prefs/mock_pref_change_callback.h b/components/prefs/mock_pref_change_callback.h index 3030fab17c23c9..b1ea0adb3e4d95 100644 --- a/components/prefs/mock_pref_change_callback.h +++ b/components/prefs/mock_pref_change_callback.h @@ -7,8 +7,8 @@ #include -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_service.h" #include "testing/gmock/include/gmock/gmock.h" using testing::Pointee; diff --git a/components/prefs/overlay_user_pref_store.cc b/components/prefs/overlay_user_pref_store.cc index dd5b68e0a63643..ff93c6438d4c44 100644 --- a/components/prefs/overlay_user_pref_store.cc +++ b/components/prefs/overlay_user_pref_store.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/overlay_user_pref_store.h" +#include "components/prefs/overlay_user_pref_store.h" #include diff --git a/components/prefs/overlay_user_pref_store.h b/components/prefs/overlay_user_pref_store.h index 35ada57123f785..92875a6dedd1e5 100644 --- a/components/prefs/overlay_user_pref_store.h +++ b/components/prefs/overlay_user_pref_store.h @@ -13,9 +13,9 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" -#include "base/prefs/base_prefs_export.h" -#include "base/prefs/persistent_pref_store.h" -#include "base/prefs/pref_value_map.h" +#include "components/prefs/base_prefs_export.h" +#include "components/prefs/persistent_pref_store.h" +#include "components/prefs/pref_value_map.h" // PersistentPrefStore that directs all write operations into an in-memory // PrefValueMap. Read operations are first answered by the PrefValueMap. diff --git a/components/prefs/overlay_user_pref_store_unittest.cc b/components/prefs/overlay_user_pref_store_unittest.cc index bf5e6a59c4fe7e..fd30ccbe9d1dd1 100644 --- a/components/prefs/overlay_user_pref_store_unittest.cc +++ b/components/prefs/overlay_user_pref_store_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/overlay_user_pref_store.h" +#include "components/prefs/overlay_user_pref_store.h" -#include "base/prefs/pref_store_observer_mock.h" -#include "base/prefs/testing_pref_store.h" #include "base/values.h" +#include "components/prefs/pref_store_observer_mock.h" +#include "components/prefs/testing_pref_store.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/prefs/persistent_pref_store.h b/components/prefs/persistent_pref_store.h index 89c7a71961c8a4..51d9656471fe73 100644 --- a/components/prefs/persistent_pref_store.h +++ b/components/prefs/persistent_pref_store.h @@ -7,8 +7,8 @@ #include -#include "base/prefs/base_prefs_export.h" -#include "base/prefs/writeable_pref_store.h" +#include "components/prefs/base_prefs_export.h" +#include "components/prefs/writeable_pref_store.h" // This interface is complementary to the PrefStore interface, declaring // additional functionality that adds support for setting values and persisting diff --git a/components/prefs/pref_change_registrar.cc b/components/prefs/pref_change_registrar.cc index 13193484ff449c..0030933e9bb920 100644 --- a/components/prefs/pref_change_registrar.cc +++ b/components/prefs/pref_change_registrar.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/pref_change_registrar.h" +#include "components/prefs/pref_change_registrar.h" #include "base/bind.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" PrefChangeRegistrar::PrefChangeRegistrar() : service_(NULL) {} diff --git a/components/prefs/pref_change_registrar.h b/components/prefs/pref_change_registrar.h index cd5a233244cb7c..5e5b6a8c983e09 100644 --- a/components/prefs/pref_change_registrar.h +++ b/components/prefs/pref_change_registrar.h @@ -10,8 +10,8 @@ #include "base/callback.h" #include "base/macros.h" -#include "base/prefs/base_prefs_export.h" -#include "base/prefs/pref_observer.h" +#include "components/prefs/base_prefs_export.h" +#include "components/prefs/pref_observer.h" class PrefService; diff --git a/components/prefs/pref_change_registrar_unittest.cc b/components/prefs/pref_change_registrar_unittest.cc index da425cfad287b2..ab350922a4c5d8 100644 --- a/components/prefs/pref_change_registrar_unittest.cc +++ b/components/prefs/pref_change_registrar_unittest.cc @@ -4,10 +4,10 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_observer.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_observer.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/prefs/pref_filter.h b/components/prefs/pref_filter.h index 82a44c6ef9bb71..bb4847b4a37f23 100644 --- a/components/prefs/pref_filter.h +++ b/components/prefs/pref_filter.h @@ -9,7 +9,7 @@ #include "base/callback_forward.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/base_prefs_export.h" +#include "components/prefs/base_prefs_export.h" namespace base { class DictionaryValue; diff --git a/components/prefs/pref_member.cc b/components/prefs/pref_member.cc index 934237d37ca9df..b848d722d1ce27 100644 --- a/components/prefs/pref_member.cc +++ b/components/prefs/pref_member.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/pref_member.h" +#include "components/prefs/pref_member.h" #include #include "base/callback.h" #include "base/callback_helpers.h" #include "base/location.h" -#include "base/prefs/pref_service.h" #include "base/thread_task_runner_handle.h" #include "base/value_conversions.h" +#include "components/prefs/pref_service.h" using base::SingleThreadTaskRunner; diff --git a/components/prefs/pref_member.h b/components/prefs/pref_member.h index 4290c0db651068..8ca97894aa36c7 100644 --- a/components/prefs/pref_member.h +++ b/components/prefs/pref_member.h @@ -33,10 +33,10 @@ #include "base/logging.h" #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/prefs/base_prefs_export.h" -#include "base/prefs/pref_observer.h" #include "base/single_thread_task_runner.h" #include "base/values.h" +#include "components/prefs/base_prefs_export.h" +#include "components/prefs/pref_observer.h" class PrefService; diff --git a/components/prefs/pref_member_unittest.cc b/components/prefs/pref_member_unittest.cc index a776e2c25535a3..73b6ed00c867be 100644 --- a/components/prefs/pref_member_unittest.cc +++ b/components/prefs/pref_member_unittest.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/pref_member.h" +#include "components/prefs/pref_member.h" #include "base/bind.h" #include "base/location.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/components/prefs/pref_notifier_impl.cc b/components/prefs/pref_notifier_impl.cc index 7ae5fe679f80e3..b3d566003c6665 100644 --- a/components/prefs/pref_notifier_impl.cc +++ b/components/prefs/pref_notifier_impl.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/pref_notifier_impl.h" +#include "components/prefs/pref_notifier_impl.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" +#include "components/prefs/pref_service.h" PrefNotifierImpl::PrefNotifierImpl() : pref_service_(NULL) { diff --git a/components/prefs/pref_notifier_impl.h b/components/prefs/pref_notifier_impl.h index 6e62e2325491f2..bd26d0332ae7e5 100644 --- a/components/prefs/pref_notifier_impl.h +++ b/components/prefs/pref_notifier_impl.h @@ -13,10 +13,10 @@ #include "base/containers/hash_tables.h" #include "base/macros.h" #include "base/observer_list.h" -#include "base/prefs/base_prefs_export.h" -#include "base/prefs/pref_notifier.h" -#include "base/prefs/pref_observer.h" #include "base/threading/thread_checker.h" +#include "components/prefs/base_prefs_export.h" +#include "components/prefs/pref_notifier.h" +#include "components/prefs/pref_observer.h" class PrefService; diff --git a/components/prefs/pref_notifier_impl_unittest.cc b/components/prefs/pref_notifier_impl_unittest.cc index cb3c3b5ebd7564..a3f12349b9f81d 100644 --- a/components/prefs/pref_notifier_impl_unittest.cc +++ b/components/prefs/pref_notifier_impl_unittest.cc @@ -6,13 +6,13 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/prefs/mock_pref_change_callback.h" -#include "base/prefs/pref_notifier_impl.h" -#include "base/prefs/pref_observer.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/pref_value_store.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/mock_pref_change_callback.h" +#include "components/prefs/pref_notifier_impl.h" +#include "components/prefs/pref_observer.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/pref_value_store.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/prefs/pref_registry.cc b/components/prefs/pref_registry.cc index 77fb9a59ad0b06..b7c91de53c1ad2 100644 --- a/components/prefs/pref_registry.cc +++ b/components/prefs/pref_registry.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/pref_registry.h" +#include "components/prefs/pref_registry.h" #include "base/logging.h" -#include "base/prefs/default_pref_store.h" -#include "base/prefs/pref_store.h" #include "base/stl_util.h" #include "base/values.h" +#include "components/prefs/default_pref_store.h" +#include "components/prefs/pref_store.h" PrefRegistry::PrefRegistry() : defaults_(new DefaultPrefStore()) { diff --git a/components/prefs/pref_registry.h b/components/prefs/pref_registry.h index 7e141d8b7e5d0f..56755ca3da9342 100644 --- a/components/prefs/pref_registry.h +++ b/components/prefs/pref_registry.h @@ -10,8 +10,8 @@ #include "base/containers/hash_tables.h" #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/prefs/base_prefs_export.h" -#include "base/prefs/pref_value_map.h" +#include "components/prefs/base_prefs_export.h" +#include "components/prefs/pref_value_map.h" namespace base { class Value; diff --git a/components/prefs/pref_registry_simple.cc b/components/prefs/pref_registry_simple.cc index b5c73e22cd58c6..4874261babc320 100644 --- a/components/prefs/pref_registry_simple.cc +++ b/components/prefs/pref_registry_simple.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/pref_registry_simple.h" +#include "components/prefs/pref_registry_simple.h" #include "base/files/file_path.h" #include "base/strings/string_number_conversions.h" diff --git a/components/prefs/pref_registry_simple.h b/components/prefs/pref_registry_simple.h index 6afc012b3f38b2..4348029642fc4b 100644 --- a/components/prefs/pref_registry_simple.h +++ b/components/prefs/pref_registry_simple.h @@ -10,8 +10,8 @@ #include #include "base/macros.h" -#include "base/prefs/base_prefs_export.h" -#include "base/prefs/pref_registry.h" +#include "components/prefs/base_prefs_export.h" +#include "components/prefs/pref_registry.h" namespace base { class DictionaryValue; diff --git a/components/prefs/pref_service.cc b/components/prefs/pref_service.cc index 077bb1d25ff5aa..aaf9fa7bbab746 100644 --- a/components/prefs/pref_service.cc +++ b/components/prefs/pref_service.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include #include @@ -12,10 +12,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/prefs/default_pref_store.h" -#include "base/prefs/pref_notifier_impl.h" -#include "base/prefs/pref_registry.h" -#include "base/prefs/pref_value_store.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" @@ -23,6 +19,10 @@ #include "base/thread_task_runner_handle.h" #include "base/value_conversions.h" #include "build/build_config.h" +#include "components/prefs/default_pref_store.h" +#include "components/prefs/pref_notifier_impl.h" +#include "components/prefs/pref_registry.h" +#include "components/prefs/pref_value_store.h" namespace { diff --git a/components/prefs/pref_service.h b/components/prefs/pref_service.h index bec7830f6d7937..7b94cb6c5cba47 100644 --- a/components/prefs/pref_service.h +++ b/components/prefs/pref_service.h @@ -23,10 +23,10 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/base_prefs_export.h" -#include "base/prefs/persistent_pref_store.h" #include "base/threading/non_thread_safe.h" #include "base/values.h" +#include "components/prefs/base_prefs_export.h" +#include "components/prefs/persistent_pref_store.h" class PrefNotifier; class PrefNotifierImpl; diff --git a/components/prefs/pref_service_factory.cc b/components/prefs/pref_service_factory.cc index 2380a86b5ace84..e8b9bb448786ee 100644 --- a/components/prefs/pref_service_factory.cc +++ b/components/prefs/pref_service_factory.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/pref_service_factory.h" +#include "components/prefs/pref_service_factory.h" #include "base/bind.h" -#include "base/prefs/default_pref_store.h" -#include "base/prefs/json_pref_store.h" -#include "base/prefs/pref_filter.h" -#include "base/prefs/pref_notifier_impl.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/pref_value_store.h" #include "base/sequenced_task_runner.h" +#include "components/prefs/default_pref_store.h" +#include "components/prefs/json_pref_store.h" +#include "components/prefs/pref_filter.h" +#include "components/prefs/pref_notifier_impl.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/pref_value_store.h" namespace base { diff --git a/components/prefs/pref_service_factory.h b/components/prefs/pref_service_factory.h index f84e0370c0f56f..b56fb233ce0f01 100644 --- a/components/prefs/pref_service_factory.h +++ b/components/prefs/pref_service_factory.h @@ -8,10 +8,10 @@ #include "base/callback.h" #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/prefs/base_prefs_export.h" -#include "base/prefs/persistent_pref_store.h" -#include "base/prefs/pref_registry.h" -#include "base/prefs/pref_store.h" +#include "components/prefs/base_prefs_export.h" +#include "components/prefs/persistent_pref_store.h" +#include "components/prefs/pref_registry.h" +#include "components/prefs/pref_store.h" class PrefService; diff --git a/components/prefs/pref_service_unittest.cc b/components/prefs/pref_service_unittest.cc index 649c35fcf7fe96..8500cf6e7990a6 100644 --- a/components/prefs/pref_service_unittest.cc +++ b/components/prefs/pref_service_unittest.cc @@ -8,15 +8,15 @@ #include #include "base/macros.h" -#include "base/prefs/json_pref_store.h" -#include "base/prefs/mock_pref_change_callback.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service_factory.h" -#include "base/prefs/pref_value_store.h" -#include "base/prefs/testing_pref_service.h" -#include "base/prefs/testing_pref_store.h" #include "base/values.h" +#include "components/prefs/json_pref_store.h" +#include "components/prefs/mock_pref_change_callback.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service_factory.h" +#include "components/prefs/pref_value_store.h" +#include "components/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_store.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/prefs/pref_store.cc b/components/prefs/pref_store.cc index f286a3313260a6..2ae0afcb08d36b 100644 --- a/components/prefs/pref_store.cc +++ b/components/prefs/pref_store.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/pref_store.h" +#include "components/prefs/pref_store.h" bool PrefStore::HasObservers() const { return false; diff --git a/components/prefs/pref_store.h b/components/prefs/pref_store.h index f95c8c42cb5893..6f0c16b65429d9 100644 --- a/components/prefs/pref_store.h +++ b/components/prefs/pref_store.h @@ -9,7 +9,7 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/prefs/base_prefs_export.h" +#include "components/prefs/base_prefs_export.h" namespace base { class Value; diff --git a/components/prefs/pref_store_observer_mock.cc b/components/prefs/pref_store_observer_mock.cc index f1a31bb985d203..a03c8580056c2d 100644 --- a/components/prefs/pref_store_observer_mock.cc +++ b/components/prefs/pref_store_observer_mock.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/pref_store_observer_mock.h" +#include "components/prefs/pref_store_observer_mock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/prefs/pref_store_observer_mock.h b/components/prefs/pref_store_observer_mock.h index 1b24b4e068f1be..107aeb351cd34c 100644 --- a/components/prefs/pref_store_observer_mock.h +++ b/components/prefs/pref_store_observer_mock.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/macros.h" -#include "base/prefs/pref_store.h" +#include "components/prefs/pref_store.h" // A mock implementation of PrefStore::Observer. class PrefStoreObserverMock : public PrefStore::Observer { diff --git a/components/prefs/pref_value_map.cc b/components/prefs/pref_value_map.cc index 2340e3c273d477..7b267cc7d16625 100644 --- a/components/prefs/pref_value_map.cc +++ b/components/prefs/pref_value_map.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/pref_value_map.h" +#include "components/prefs/pref_value_map.h" #include #include diff --git a/components/prefs/pref_value_map.h b/components/prefs/pref_value_map.h index 349fe685201060..56c32b0d9e89bd 100644 --- a/components/prefs/pref_value_map.h +++ b/components/prefs/pref_value_map.h @@ -11,7 +11,7 @@ #include "base/containers/scoped_ptr_hash_map.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/base_prefs_export.h" +#include "components/prefs/base_prefs_export.h" namespace base { class Value; diff --git a/components/prefs/pref_value_map_unittest.cc b/components/prefs/pref_value_map_unittest.cc index f78c999916316e..04001a219eaa95 100644 --- a/components/prefs/pref_value_map_unittest.cc +++ b/components/prefs/pref_value_map_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/pref_value_map.h" +#include "components/prefs/pref_value_map.h" #include "base/values.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/prefs/pref_value_store.cc b/components/prefs/pref_value_store.cc index fe7cd67d08eb59..4c7a4e5d9cf650 100644 --- a/components/prefs/pref_value_store.cc +++ b/components/prefs/pref_value_store.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/pref_value_store.h" +#include "components/prefs/pref_value_store.h" #include #include "base/logging.h" -#include "base/prefs/pref_notifier.h" -#include "base/prefs/pref_observer.h" +#include "components/prefs/pref_notifier.h" +#include "components/prefs/pref_observer.h" PrefValueStore::PrefStoreKeeper::PrefStoreKeeper() : pref_value_store_(NULL), diff --git a/components/prefs/pref_value_store.h b/components/prefs/pref_value_store.h index 8ec8c593849bd3..3a2bf1594fa3c1 100644 --- a/components/prefs/pref_value_store.h +++ b/components/prefs/pref_value_store.h @@ -12,9 +12,9 @@ #include "base/callback.h" #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/prefs/base_prefs_export.h" -#include "base/prefs/pref_store.h" #include "base/values.h" +#include "components/prefs/base_prefs_export.h" +#include "components/prefs/pref_store.h" class PrefNotifier; class PrefStore; diff --git a/components/prefs/pref_value_store_unittest.cc b/components/prefs/pref_value_store_unittest.cc index e214adfa1c7f50..90ee7d689a8918 100644 --- a/components/prefs/pref_value_store_unittest.cc +++ b/components/prefs/pref_value_store_unittest.cc @@ -7,10 +7,10 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_notifier.h" -#include "base/prefs/pref_value_store.h" -#include "base/prefs/testing_pref_store.h" #include "base/values.h" +#include "components/prefs/pref_notifier.h" +#include "components/prefs/pref_value_store.h" +#include "components/prefs/testing_pref_store.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/prefs/scoped_user_pref_update.cc b/components/prefs/scoped_user_pref_update.cc index 1440a5711d8f91..dfba3349a2d5ae 100644 --- a/components/prefs/scoped_user_pref_update.cc +++ b/components/prefs/scoped_user_pref_update.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/scoped_user_pref_update.h" +#include "components/prefs/scoped_user_pref_update.h" #include "base/logging.h" -#include "base/prefs/pref_notifier.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_notifier.h" +#include "components/prefs/pref_service.h" namespace subtle { diff --git a/components/prefs/scoped_user_pref_update.h b/components/prefs/scoped_user_pref_update.h index 29ad8526cd3c3c..5a2c3aec9649e0 100644 --- a/components/prefs/scoped_user_pref_update.h +++ b/components/prefs/scoped_user_pref_update.h @@ -11,10 +11,10 @@ #include #include "base/macros.h" -#include "base/prefs/base_prefs_export.h" -#include "base/prefs/pref_service.h" #include "base/threading/non_thread_safe.h" #include "base/values.h" +#include "components/prefs/base_prefs_export.h" +#include "components/prefs/pref_service.h" class PrefService; diff --git a/components/prefs/scoped_user_pref_update_unittest.cc b/components/prefs/scoped_user_pref_update_unittest.cc index 48e3dc4f7d4253..437dff6fe9fa22 100644 --- a/components/prefs/scoped_user_pref_update_unittest.cc +++ b/components/prefs/scoped_user_pref_update_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/mock_pref_change_callback.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/scoped_user_pref_update.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/mock_pref_change_callback.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/scoped_user_pref_update.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/prefs/testing_pref_service.cc b/components/prefs/testing_pref_service.cc index 5899376ad1852e..1dd760e72d65ba 100644 --- a/components/prefs/testing_pref_service.cc +++ b/components/prefs/testing_pref_service.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/prefs/default_pref_store.h" -#include "base/prefs/pref_notifier_impl.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_value_store.h" +#include "components/prefs/default_pref_store.h" +#include "components/prefs/pref_notifier_impl.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_value_store.h" #include "testing/gtest/include/gtest/gtest.h" template <> diff --git a/components/prefs/testing_pref_service.h b/components/prefs/testing_pref_service.h index 85a2879f8ac39b..5391c512f94f8b 100644 --- a/components/prefs/testing_pref_service.h +++ b/components/prefs/testing_pref_service.h @@ -8,9 +8,9 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_registry.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/testing_pref_store.h" +#include "components/prefs/pref_registry.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/testing_pref_store.h" class PrefNotifierImpl; class PrefRegistrySimple; diff --git a/components/prefs/testing_pref_store.cc b/components/prefs/testing_pref_store.cc index 33e1dc22e5582b..45c608c6d16022 100644 --- a/components/prefs/testing_pref_store.cc +++ b/components/prefs/testing_pref_store.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/testing_pref_store.h" +#include "components/prefs/testing_pref_store.h" #include diff --git a/components/prefs/testing_pref_store.h b/components/prefs/testing_pref_store.h index 713e69a7d4e072..e2a59977f74961 100644 --- a/components/prefs/testing_pref_store.h +++ b/components/prefs/testing_pref_store.h @@ -12,8 +12,8 @@ #include "base/compiler_specific.h" #include "base/macros.h" #include "base/observer_list.h" -#include "base/prefs/persistent_pref_store.h" -#include "base/prefs/pref_value_map.h" +#include "components/prefs/persistent_pref_store.h" +#include "components/prefs/pref_value_map.h" // |TestingPrefStore| is a preference store implementation that allows tests to // explicitly manipulate the contents of the store, triggering notifications diff --git a/components/prefs/value_map_pref_store.cc b/components/prefs/value_map_pref_store.cc index fdb087fc9ec220..fe2c80893db34f 100644 --- a/components/prefs/value_map_pref_store.cc +++ b/components/prefs/value_map_pref_store.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/value_map_pref_store.h" +#include "components/prefs/value_map_pref_store.h" #include #include diff --git a/components/prefs/value_map_pref_store.h b/components/prefs/value_map_pref_store.h index eac785d4e2551d..517d07ef738b8f 100644 --- a/components/prefs/value_map_pref_store.h +++ b/components/prefs/value_map_pref_store.h @@ -12,9 +12,9 @@ #include "base/macros.h" #include "base/observer_list.h" -#include "base/prefs/base_prefs_export.h" -#include "base/prefs/pref_value_map.h" -#include "base/prefs/writeable_pref_store.h" +#include "components/prefs/base_prefs_export.h" +#include "components/prefs/pref_value_map.h" +#include "components/prefs/writeable_pref_store.h" // A basic PrefStore implementation that uses a simple name-value map for // storing the preference values. diff --git a/components/prefs/writeable_pref_store.h b/components/prefs/writeable_pref_store.h index f7da279ac02ee9..94754d389ce0be 100644 --- a/components/prefs/writeable_pref_store.h +++ b/components/prefs/writeable_pref_store.h @@ -11,7 +11,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_store.h" +#include "components/prefs/pref_store.h" namespace base { class Value; diff --git a/components/proximity_auth/DEPS b/components/proximity_auth/DEPS index 5b55479fd30020..aa6fdede3cfb05 100644 --- a/components/proximity_auth/DEPS +++ b/components/proximity_auth/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+components/prefs", "+components/signin/core/account_id/account_id.h", "+device/bluetooth", "+net", diff --git a/components/proximity_auth/ble/bluetooth_low_energy_device_whitelist.cc b/components/proximity_auth/ble/bluetooth_low_energy_device_whitelist.cc index 8bf905e4aa0ecd..36425f0c3a1789 100644 --- a/components/proximity_auth/ble/bluetooth_low_energy_device_whitelist.cc +++ b/components/proximity_auth/ble/bluetooth_low_energy_device_whitelist.cc @@ -8,10 +8,10 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/values.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/proximity_auth/ble/pref_names.h" #include "components/proximity_auth/logging/logging.h" diff --git a/components/proximity_auth/ble/bluetooth_low_energy_device_whitelist_unittest.cc b/components/proximity_auth/ble/bluetooth_low_energy_device_whitelist_unittest.cc index 54a74a01b5ac06..5a9256fa4d5bc4 100644 --- a/components/proximity_auth/ble/bluetooth_low_energy_device_whitelist_unittest.cc +++ b/components/proximity_auth/ble/bluetooth_low_energy_device_whitelist_unittest.cc @@ -10,7 +10,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "components/proximity_auth/ble/pref_names.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/proximity_auth/cryptauth/cryptauth_device_manager.cc b/components/proximity_auth/cryptauth/cryptauth_device_manager.cc index a931cc887d235e..8736bae4fbbf5b 100644 --- a/components/proximity_auth/cryptauth/cryptauth_device_manager.cc +++ b/components/proximity_auth/cryptauth/cryptauth_device_manager.cc @@ -8,9 +8,9 @@ #include #include "base/base64url.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/proximity_auth/cryptauth/cryptauth_client.h" #include "components/proximity_auth/cryptauth/pref_names.h" #include "components/proximity_auth/cryptauth/sync_scheduler_impl.h" diff --git a/components/proximity_auth/cryptauth/cryptauth_device_manager_unittest.cc b/components/proximity_auth/cryptauth/cryptauth_device_manager_unittest.cc index e70f5a9d5fca8c..61074e9b3e709b 100644 --- a/components/proximity_auth/cryptauth/cryptauth_device_manager_unittest.cc +++ b/components/proximity_auth/cryptauth/cryptauth_device_manager_unittest.cc @@ -10,10 +10,10 @@ #include "base/base64url.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/scoped_user_pref_update.h" -#include "base/prefs/testing_pref_service.h" #include "base/strings/stringprintf.h" #include "base/test/simple_test_clock.h" +#include "components/prefs/scoped_user_pref_update.h" +#include "components/prefs/testing_pref_service.h" #include "components/proximity_auth/cryptauth/fake_cryptauth_gcm_manager.h" #include "components/proximity_auth/cryptauth/mock_cryptauth_client.h" #include "components/proximity_auth/cryptauth/mock_sync_scheduler.h" diff --git a/components/proximity_auth/cryptauth/cryptauth_enrollment_manager.cc b/components/proximity_auth/cryptauth/cryptauth_enrollment_manager.cc index 22d97ecfe3209a..52b288c2e5068b 100644 --- a/components/proximity_auth/cryptauth/cryptauth_enrollment_manager.cc +++ b/components/proximity_auth/cryptauth/cryptauth_enrollment_manager.cc @@ -7,10 +7,10 @@ #include #include "base/base64url.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/time/clock.h" #include "base/time/time.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/proximity_auth/cryptauth/cryptauth_enroller.h" #include "components/proximity_auth/cryptauth/pref_names.h" #include "components/proximity_auth/cryptauth/secure_message_delegate.h" diff --git a/components/proximity_auth/cryptauth/cryptauth_enrollment_manager_unittest.cc b/components/proximity_auth/cryptauth/cryptauth_enrollment_manager_unittest.cc index 99756d04e163d8..135a42fba0249c 100644 --- a/components/proximity_auth/cryptauth/cryptauth_enrollment_manager_unittest.cc +++ b/components/proximity_auth/cryptauth/cryptauth_enrollment_manager_unittest.cc @@ -9,10 +9,10 @@ #include "base/base64url.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/testing_pref_service.h" #include "base/test/simple_test_clock.h" #include "base/time/clock.h" #include "base/time/time.h" +#include "components/prefs/testing_pref_service.h" #include "components/proximity_auth/cryptauth/cryptauth_enroller.h" #include "components/proximity_auth/cryptauth/fake_cryptauth_gcm_manager.h" #include "components/proximity_auth/cryptauth/fake_secure_message_delegate.h" diff --git a/components/proximity_auth/cryptauth/cryptauth_gcm_manager.cc b/components/proximity_auth/cryptauth/cryptauth_gcm_manager.cc index 3b4bbfaee13a5f..2746c75daef07b 100644 --- a/components/proximity_auth/cryptauth/cryptauth_gcm_manager.cc +++ b/components/proximity_auth/cryptauth/cryptauth_gcm_manager.cc @@ -4,7 +4,7 @@ #include "components/proximity_auth/cryptauth/cryptauth_gcm_manager.h" -#include "base/prefs/pref_registry_simple.h" +#include "components/prefs/pref_registry_simple.h" #include "components/proximity_auth/cryptauth/pref_names.h" namespace proximity_auth { diff --git a/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc b/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc index 834e42a6cb3ebb..588ddcf3a458db 100644 --- a/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc +++ b/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc @@ -5,9 +5,9 @@ #include "components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.h" #include "base/bind.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "components/gcm_driver/gcm_driver.h" +#include "components/prefs/pref_service.h" #include "components/proximity_auth/cryptauth/pref_names.h" #include "components/proximity_auth/logging/logging.h" diff --git a/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl_unittest.cc b/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl_unittest.cc index 89fbbd8f05f8fd..e07ec348275350 100644 --- a/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl_unittest.cc +++ b/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl_unittest.cc @@ -5,9 +5,9 @@ #include "components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.h" #include "base/macros.h" -#include "base/prefs/testing_pref_service.h" #include "components/gcm_driver/fake_gcm_driver.h" #include "components/gcm_driver/gcm_client.h" +#include "components/prefs/testing_pref_service.h" #include "components/proximity_auth/cryptauth/pref_names.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/proximity_auth/proximity_auth_pref_manager.cc b/components/proximity_auth/proximity_auth_pref_manager.cc index f28e1103e79b6c..20c49c10480d88 100644 --- a/components/proximity_auth/proximity_auth_pref_manager.cc +++ b/components/proximity_auth/proximity_auth_pref_manager.cc @@ -8,10 +8,10 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/values.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/proximity_auth/logging/logging.h" #include "components/proximity_auth/proximity_auth_pref_names.h" diff --git a/components/proximity_auth/proximity_auth_pref_manager_unittest.cc b/components/proximity_auth/proximity_auth_pref_manager_unittest.cc index 17a97769920eb1..662dfe4593c5f3 100644 --- a/components/proximity_auth/proximity_auth_pref_manager_unittest.cc +++ b/components/proximity_auth/proximity_auth_pref_manager_unittest.cc @@ -10,7 +10,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "components/proximity_auth/proximity_auth_pref_names.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/proximity_auth/webui/proximity_auth_webui_handler.cc b/components/proximity_auth/webui/proximity_auth_webui_handler.cc index 5ef9f17dc1ecd8..80ab97ee559694 100644 --- a/components/proximity_auth/webui/proximity_auth_webui_handler.cc +++ b/components/proximity_auth/webui/proximity_auth_webui_handler.cc @@ -10,11 +10,11 @@ #include "base/base64url.h" #include "base/bind.h" #include "base/i18n/time_formatting.h" -#include "base/prefs/pref_service.h" #include "base/thread_task_runner_handle.h" #include "base/time/default_clock.h" #include "base/time/default_tick_clock.h" #include "base/values.h" +#include "components/prefs/pref_service.h" #include "components/proximity_auth/ble/pref_names.h" #include "components/proximity_auth/bluetooth_connection_finder.h" #include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h" diff --git a/components/proxy_config/DEPS b/components/proxy_config/DEPS index 0a84ee133b9ec2..069741e16408dc 100644 --- a/components/proxy_config/DEPS +++ b/components/proxy_config/DEPS @@ -1,4 +1,5 @@ include_rules = [ "+components/pref_registry", + "+components/prefs", "+net" ] diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/components/proxy_config/pref_proxy_config_tracker_impl.cc index 72a08600b1b6ff..378923e5b7aa77 100644 --- a/components/proxy_config/pref_proxy_config_tracker_impl.cc +++ b/components/proxy_config/pref_proxy_config_tracker_impl.cc @@ -9,12 +9,12 @@ #include "base/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" #include "base/values.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/proxy_config/proxy_config_dictionary.h" #include "components/proxy_config/proxy_config_pref_names.h" #include "net/proxy/proxy_list.h" diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.h b/components/proxy_config/pref_proxy_config_tracker_impl.h index 0f0aba1b4c3186..2f14ed738bff46 100644 --- a/components/proxy_config/pref_proxy_config_tracker_impl.h +++ b/components/proxy_config/pref_proxy_config_tracker_impl.h @@ -9,8 +9,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/pref_change_registrar.h" #include "base/threading/thread_checker.h" +#include "components/prefs/pref_change_registrar.h" #include "components/proxy_config/pref_proxy_config_tracker.h" #include "components/proxy_config/proxy_config_dictionary.h" #include "net/proxy/proxy_config.h" diff --git a/components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc b/components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc index ba59df6ad279ce..f28d61a4bd186c 100644 --- a/components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc +++ b/components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc @@ -9,10 +9,10 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/test/histogram_tester.h" #include "base/thread_task_runner_handle.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "components/proxy_config/proxy_config_dictionary.h" #include "components/proxy_config/proxy_config_pref_names.h" #include "net/proxy/proxy_info.h" diff --git a/components/rappor/DEPS b/components/rappor/DEPS index 68455c7b8b960a..21030ecc20717a 100644 --- a/components/rappor/DEPS +++ b/components/rappor/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+components/data_use_measurement/core", "+components/metrics", + "+components/prefs", "+components/variations", "+crypto", "+net", diff --git a/components/rappor/rappor_prefs.cc b/components/rappor/rappor_prefs.cc index 3606b327c0af8a..20894fdd459f47 100644 --- a/components/rappor/rappor_prefs.cc +++ b/components/rappor/rappor_prefs.cc @@ -6,10 +6,10 @@ #include "base/base64.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "components/metrics/daily_event.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/rappor/byte_vector_utils.h" #include "components/rappor/rappor_parameters.h" #include "components/rappor/rappor_pref_names.h" diff --git a/components/rappor/rappor_prefs_unittest.cc b/components/rappor/rappor_prefs_unittest.cc index f64f454e16bcd2..29e5d614d33e30 100644 --- a/components/rappor/rappor_prefs_unittest.cc +++ b/components/rappor/rappor_prefs_unittest.cc @@ -8,8 +8,8 @@ #include "base/base64.h" #include "base/macros.h" -#include "base/prefs/testing_pref_service.h" #include "base/test/histogram_tester.h" +#include "components/prefs/testing_pref_service.h" #include "components/rappor/byte_vector_utils.h" #include "components/rappor/proto/rappor_metric.pb.h" #include "components/rappor/rappor_pref_names.h" diff --git a/components/rappor/rappor_service_unittest.cc b/components/rappor/rappor_service_unittest.cc index b475dbc2d4364a..711722dbde9093 100644 --- a/components/rappor/rappor_service_unittest.cc +++ b/components/rappor/rappor_service_unittest.cc @@ -10,7 +10,7 @@ #include "base/base64.h" #include "base/metrics/metrics_hashes.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "components/rappor/byte_vector_utils.h" #include "components/rappor/proto/rappor_metric.pb.h" #include "components/rappor/rappor_parameters.h" diff --git a/components/rappor/test_rappor_service.h b/components/rappor/test_rappor_service.h index 6cb48f662ca7a1..56e85db1277286 100644 --- a/components/rappor/test_rappor_service.h +++ b/components/rappor/test_rappor_service.h @@ -12,7 +12,7 @@ #include #include "base/macros.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "components/rappor/rappor_service.h" #include "components/rappor/test_log_uploader.h" diff --git a/components/search_engines/DEPS b/components/search_engines/DEPS index 464f2241ced662..3fe96843fcbf6b 100644 --- a/components/search_engines/DEPS +++ b/components/search_engines/DEPS @@ -7,6 +7,7 @@ include_rules = [ "+components/omnibox/browser/omnibox_field_trial.h", "+components/policy/core", "+components/pref_registry", + "+components/prefs", "+components/rappor", "+components/sync_driver", "+components/url_formatter", diff --git a/components/search_engines/default_search_manager.cc b/components/search_engines/default_search_manager.cc index 15b008314616e5..22cfb06e82d277 100644 --- a/components/search_engines/default_search_manager.cc +++ b/components/search_engines/default_search_manager.cc @@ -15,8 +15,6 @@ #include "base/compiler_specific.h" #include "base/i18n/case_conversion.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/pref_value_map.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" @@ -24,6 +22,8 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/pref_value_map.h" #include "components/search_engines/search_engines_pref_names.h" #include "components/search_engines/template_url_data.h" #include "components/search_engines/template_url_prepopulate_data.h" diff --git a/components/search_engines/default_search_manager.h b/components/search_engines/default_search_manager.h index 2261d1b220addc..774bf27b7bc152 100644 --- a/components/search_engines/default_search_manager.h +++ b/components/search_engines/default_search_manager.h @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_change_registrar.h" +#include "components/prefs/pref_change_registrar.h" namespace base { class DictionaryValue; diff --git a/components/search_engines/default_search_policy_handler.cc b/components/search_engines/default_search_policy_handler.cc index e0362e9c26fcf0..d8389934500a18 100644 --- a/components/search_engines/default_search_policy_handler.cc +++ b/components/search_engines/default_search_policy_handler.cc @@ -8,12 +8,12 @@ #include #include "base/macros.h" -#include "base/prefs/pref_value_map.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" +#include "components/prefs/pref_value_map.h" #include "components/search_engines/default_search_manager.h" #include "components/search_engines/search_engines_pref_names.h" #include "components/search_engines/search_terms_data.h" diff --git a/components/search_engines/default_search_pref_migration.cc b/components/search_engines/default_search_pref_migration.cc index c85db9ba1fba13..344a8d47e59cd3 100644 --- a/components/search_engines/default_search_pref_migration.cc +++ b/components/search_engines/default_search_pref_migration.cc @@ -12,10 +12,10 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/default_search_manager.h" #include "components/search_engines/search_engines_pref_names.h" #include "components/search_engines/template_url_data.h" diff --git a/components/search_engines/desktop_search_win.cc b/components/search_engines/desktop_search_win.cc index b1bae715aec628..d741c93353bf42 100644 --- a/components/search_engines/desktop_search_win.cc +++ b/components/search_engines/desktop_search_win.cc @@ -7,9 +7,9 @@ #include #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/prepopulated_engines.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_prepopulate_data.h" diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc index 4127ce68217aa7..cff4ee7a7b95a5 100644 --- a/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc @@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string16.h" #include "base/strings/string_piece.h" @@ -19,6 +18,7 @@ #include "build/build_config.h" #include "components/google/core/browser/google_util.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/prepopulated_engines.h" #include "components/search_engines/search_engines_pref_names.h" #include "components/search_engines/template_url.h" diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc index eae5a8450b6d3a..40d2008df9bcf0 100644 --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc @@ -14,7 +14,6 @@ #include "base/i18n/case_conversion.h" #include "base/memory/scoped_vector.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" #include "base/profiler/scoped_tracker.h" #include "base/stl_util.h" #include "base/strings/string_split.h" @@ -24,6 +23,7 @@ #include "base/time/time.h" #include "components/omnibox/browser/omnibox_field_trial.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "components/rappor/rappor_service.h" #include "components/search_engines/search_engines_pref_names.h" #include "components/search_engines/search_host_to_urls_map.h" diff --git a/components/search_engines/template_url_service.h b/components/search_engines/template_url_service.h index ecc910bb6a1f57..c56da710ee3ec2 100644 --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h @@ -18,10 +18,10 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/pref_change_registrar.h" #include "base/time/clock.h" #include "components/google/core/browser/google_url_tracker.h" #include "components/keyed_service/core/keyed_service.h" +#include "components/prefs/pref_change_registrar.h" #include "components/search_engines/default_search_manager.h" #include "components/search_engines/keyword_web_data_service.h" #include "components/search_engines/template_url.h" diff --git a/components/search_engines/util.cc b/components/search_engines/util.cc index 1247ce2a953d1e..e3c22c16c1e47d 100644 --- a/components/search_engines/util.cc +++ b/components/search_engines/util.cc @@ -14,8 +14,8 @@ #include "base/logging.h" #include "base/memory/scoped_vector.h" -#include "base/prefs/pref_service.h" #include "base/time/time.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_prepopulate_data.h" #include "components/search_engines/template_url_service.h" diff --git a/components/security_interstitials/DEPS b/components/security_interstitials/DEPS index e89fe67024fbd8..d690007e83e138 100644 --- a/components/security_interstitials/DEPS +++ b/components/security_interstitials/DEPS @@ -2,6 +2,7 @@ include_rules = [ "+components/google/core/browser", "+components/history/core/browser", "+components/metrics", + "+components/prefs", "+components/rappor", "+components/ssl_errors", "+components/url_formatter", diff --git a/components/security_interstitials/core/controller_client.cc b/components/security_interstitials/core/controller_client.cc index 0a32c7af5b0e7a..c4eb2f1eb52c02 100644 --- a/components/security_interstitials/core/controller_client.cc +++ b/components/security_interstitials/core/controller_client.cc @@ -6,8 +6,8 @@ #include -#include "base/prefs/pref_service.h" #include "components/google/core/browser/google_util.h" +#include "components/prefs/pref_service.h" #include "components/security_interstitials/core/metrics_helper.h" #include "grit/components_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/components/signin/DEPS b/components/signin/DEPS index b27e97e5db50dc..89ffc6df341664 100644 --- a/components/signin/DEPS +++ b/components/signin/DEPS @@ -4,6 +4,7 @@ include_rules = [ "+components/keyed_service/core", "+components/os_crypt", "+components/pref_registry", + "+components/prefs", "+components/webdata/common", "+crypto", "+google_apis/gaia", diff --git a/components/signin/core/browser/about_signin_internals.cc b/components/signin/core/browser/about_signin_internals.cc index 3c2aa80dd2b106..349d7a2ff8a967 100644 --- a/components/signin/core/browser/about_signin_internals.cc +++ b/components/signin/core/browser/about_signin_internals.cc @@ -10,13 +10,13 @@ #include "base/hash.h" #include "base/i18n/time_formatting.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "base/profiler/scoped_tracker.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_client.h" diff --git a/components/signin/core/browser/account_fetcher_service.cc b/components/signin/core/browser/account_fetcher_service.cc index 1902fcc519f42e..0c8fe58a654400 100644 --- a/components/signin/core/browser/account_fetcher_service.cc +++ b/components/signin/core/browser/account_fetcher_service.cc @@ -8,11 +8,11 @@ #include "base/command_line.h" #include "base/metrics/field_trial.h" -#include "base/prefs/pref_service.h" #include "base/profiler/scoped_tracker.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/account_info_fetcher.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/child_account_info_fetcher.h" diff --git a/components/signin/core/browser/account_tracker_service.cc b/components/signin/core/browser/account_tracker_service.cc index a048589d99f05e..12965902a881cf 100644 --- a/components/signin/core/browser/account_tracker_service.cc +++ b/components/signin/core/browser/account_tracker_service.cc @@ -9,13 +9,13 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/logging.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/profiler/scoped_tracker.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/signin/core/browser/signin_client.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/common/signin_pref_names.h" diff --git a/components/signin/core/browser/account_tracker_service_unittest.cc b/components/signin/core/browser/account_tracker_service_unittest.cc index 1dabd819b41d3e..1a60908744ac73 100644 --- a/components/signin/core/browser/account_tracker_service_unittest.cc +++ b/components/signin/core/browser/account_tracker_service_unittest.cc @@ -5,10 +5,10 @@ #include #include -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/scoped_user_pref_update.h" -#include "base/prefs/testing_pref_service.h" #include "base/strings/stringprintf.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/scoped_user_pref_update.h" +#include "components/prefs/testing_pref_service.h" #include "components/signin/core/browser/account_fetcher_service.h" #include "components/signin/core/browser/account_info.h" #include "components/signin/core/browser/account_tracker_service.h" diff --git a/components/signin/core/browser/fake_signin_manager.cc b/components/signin/core/browser/fake_signin_manager.cc index cabf4aa6f8afaf..2071eea078b0d4 100644 --- a/components/signin/core/browser/fake_signin_manager.cc +++ b/components/signin/core/browser/fake_signin_manager.cc @@ -5,8 +5,8 @@ #include "components/signin/core/browser/fake_signin_manager.h" #include "base/callback_helpers.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/signin_metrics.h" diff --git a/components/signin/core/browser/gaia_cookie_manager_service_unittest.cc b/components/signin/core/browser/gaia_cookie_manager_service_unittest.cc index 23a0b26229221d..bd0bff9af1231f 100644 --- a/components/signin/core/browser/gaia_cookie_manager_service_unittest.cc +++ b/components/signin/core/browser/gaia_cookie_manager_service_unittest.cc @@ -11,12 +11,12 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/single_thread_task_runner.h" #include "base/strings/stringprintf.h" #include "base/test/histogram_tester.h" #include "base/thread_task_runner_handle.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/gaia_cookie_manager_service.h" #include "components/signin/core/browser/test_signin_client.h" diff --git a/components/signin/core/browser/refresh_token_annotation_request.cc b/components/signin/core/browser/refresh_token_annotation_request.cc index c36874ad49b28d..edcb3a651a3b76 100644 --- a/components/signin/core/browser/refresh_token_annotation_request.cc +++ b/components/signin/core/browser/refresh_token_annotation_request.cc @@ -6,12 +6,12 @@ #include "base/location.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/single_thread_task_runner.h" #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h" #include "base/time/time.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/signin_client.h" #include "components/signin/core/common/signin_pref_names.h" #include "google_apis/gaia/gaia_constants.h" diff --git a/components/signin/core/browser/refresh_token_annotation_request_unittest.cc b/components/signin/core/browser/refresh_token_annotation_request_unittest.cc index c7764d1bd47b2f..bc4c51d2ff0b26 100644 --- a/components/signin/core/browser/refresh_token_annotation_request_unittest.cc +++ b/components/signin/core/browser/refresh_token_annotation_request_unittest.cc @@ -4,8 +4,8 @@ #include "components/signin/core/browser/refresh_token_annotation_request.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "components/signin/core/common/signin_pref_names.h" #include "net/url_request/url_request_context_getter.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/signin/core/browser/signin_client.cc b/components/signin/core/browser/signin_client.cc index 527b23355d4ee6..2e70ebe977f932 100644 --- a/components/signin/core/browser/signin_client.cc +++ b/components/signin/core/browser/signin_client.cc @@ -6,7 +6,7 @@ #include "base/guid.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/common/signin_pref_names.h" namespace { diff --git a/components/signin/core/browser/signin_investigator.h b/components/signin/core/browser/signin_investigator.h index 0bfbfbec95a205..a4a858536b6733 100644 --- a/components/signin/core/browser/signin_investigator.h +++ b/components/signin/core/browser/signin_investigator.h @@ -8,7 +8,7 @@ #include #include "base/macros.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" // A Java counterpart will be generated for this enum. // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.signin diff --git a/components/signin/core/browser/signin_investigator_unittest.cc b/components/signin/core/browser/signin_investigator_unittest.cc index 4fefc6414d251c..0f5d25fff90968 100644 --- a/components/signin/core/browser/signin_investigator_unittest.cc +++ b/components/signin/core/browser/signin_investigator_unittest.cc @@ -4,9 +4,9 @@ #include -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/test/histogram_tester.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "components/signin/core/browser/signin_investigator.h" #include "components/signin/core/browser/signin_metrics.h" #include "components/signin/core/common/signin_pref_names.h" diff --git a/components/signin/core/browser/signin_manager.cc b/components/signin/core/browser/signin_manager.cc index b2432d8db52863..10e6ce3597e0a4 100644 --- a/components/signin/core/browser/signin_manager.cc +++ b/components/signin/core/browser/signin_manager.cc @@ -8,11 +8,11 @@ #include #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/gaia_cookie_manager_service.h" #include "components/signin/core/browser/signin_client.h" diff --git a/components/signin/core/browser/signin_manager.h b/components/signin/core/browser/signin_manager.h index 91f5266c5676dd..d539db73590854 100644 --- a/components/signin/core/browser/signin_manager.h +++ b/components/signin/core/browser/signin_manager.h @@ -30,10 +30,10 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_member.h" #include "build/build_config.h" #include "components/keyed_service/core/keyed_service.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_member.h" #include "components/signin/core/browser/account_info.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" diff --git a/components/signin/core/browser/signin_manager_base.cc b/components/signin/core/browser/signin_manager_base.cc index cd3d9cd521462c..efbb7e4ad41e2b 100644 --- a/components/signin/core/browser/signin_manager_base.cc +++ b/components/signin/core/browser/signin_manager_base.cc @@ -9,11 +9,11 @@ #include "base/command_line.h" #include "base/memory/ref_counted.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/account_info.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/signin_client.h" diff --git a/components/signin/core/browser/signin_manager_base.h b/components/signin/core/browser/signin_manager_base.h index d99f5c1f03c396..b4786d698bc00b 100644 --- a/components/signin/core/browser/signin_manager_base.h +++ b/components/signin/core/browser/signin_manager_base.h @@ -30,9 +30,9 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_member.h" #include "components/keyed_service/core/keyed_service.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_member.h" #include "components/signin/core/browser/account_info.h" #include "components/signin/core/browser/signin_internals_util.h" #include "google_apis/gaia/google_service_auth_error.h" diff --git a/components/signin/ios/browser/account_consistency_service.mm b/components/signin/ios/browser/account_consistency_service.mm index 39cc25de7124dd..6c7c80654bd901 100644 --- a/components/signin/ios/browser/account_consistency_service.mm +++ b/components/signin/ios/browser/account_consistency_service.mm @@ -10,11 +10,11 @@ #include "base/logging.h" #import "base/mac/foundation_util.h" #include "base/macros.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/sys_string_conversions.h" #include "base/time/time.h" #include "components/google/core/browser/google_util.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/signin/core/browser/account_reconcilor.h" #include "components/signin/core/browser/signin_client.h" #include "components/signin/core/browser/signin_header_helper.h" diff --git a/components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.mm b/components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.mm index 3e7fa2085bd8a3..80c9ae0539a831 100644 --- a/components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.mm +++ b/components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.mm @@ -14,11 +14,11 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/stl_util.h" #include "base/strings/sys_string_conversions.h" #include "base/values.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/signin/core/browser/account_info.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/signin_client.h" diff --git a/components/signin/ios/browser/profile_oauth2_token_service_ios_delegate_unittest.mm b/components/signin/ios/browser/profile_oauth2_token_service_ios_delegate_unittest.mm index 2771bd0e2da4e5..364a3d4db3b8ff 100644 --- a/components/signin/ios/browser/profile_oauth2_token_service_ios_delegate_unittest.mm +++ b/components/signin/ios/browser/profile_oauth2_token_service_ios_delegate_unittest.mm @@ -4,9 +4,9 @@ #include "components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/test_signin_client.h" diff --git a/components/ssl_config/DEPS b/components/ssl_config/DEPS index 198af50ab5798e..0fa195e2d9eff6 100644 --- a/components/ssl_config/DEPS +++ b/components/ssl_config/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+components/content_settings/core/browser", "+components/content_settings/core/common", + "+components/prefs", "+net/socket", "+net/ssl", ] diff --git a/components/ssl_config/ssl_config_service_manager_pref.cc b/components/ssl_config/ssl_config_service_manager_pref.cc index aaa707087ca164..8d8cf5ce4b9089 100644 --- a/components/ssl_config/ssl_config_service_manager_pref.cc +++ b/components/ssl_config/ssl_config_service_manager_pref.cc @@ -12,15 +12,15 @@ #include "base/bind.h" #include "base/macros.h" #include "base/metrics/field_trial.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_member.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" #include "base/values.h" #include "components/content_settings/core/browser/content_settings_utils.h" #include "components/content_settings/core/common/content_settings.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_member.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/ssl_config/ssl_config_prefs.h" #include "components/ssl_config/ssl_config_switches.h" #include "net/ssl/ssl_cipher_suite_names.h" diff --git a/components/ssl_config/ssl_config_service_manager_pref_unittest.cc b/components/ssl_config/ssl_config_service_manager_pref_unittest.cc index 85cbc20a4c31e6..72b881809acad9 100644 --- a/components/ssl_config/ssl_config_service_manager_pref_unittest.cc +++ b/components/ssl_config/ssl_config_service_manager_pref_unittest.cc @@ -6,9 +6,9 @@ #include "base/memory/ref_counted.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/testing_pref_service.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" +#include "components/prefs/testing_pref_service.h" #include "components/ssl_config/ssl_config_prefs.h" #include "components/ssl_config/ssl_config_switches.h" #include "net/ssl/ssl_config.h" diff --git a/components/startup_metric_utils/browser/DEPS b/components/startup_metric_utils/browser/DEPS index 08f123b7c01bb3..30766b4362873c 100644 --- a/components/startup_metric_utils/browser/DEPS +++ b/components/startup_metric_utils/browser/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+components/prefs", "+components/version_info", "+content/public/browser", ] diff --git a/components/startup_metric_utils/browser/startup_metric_utils.cc b/components/startup_metric_utils/browser/startup_metric_utils.cc index 8e18935fbdea75..31890eb5238716 100644 --- a/components/startup_metric_utils/browser/startup_metric_utils.cc +++ b/components/startup_metric_utils/browser/startup_metric_utils.cc @@ -12,14 +12,14 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/process/process_info.h" #include "base/strings/string_number_conversions.h" #include "base/sys_info.h" #include "base/threading/platform_thread.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/startup_metric_utils/browser/pref_names.h" #include "components/version_info/version_info.h" diff --git a/components/suggestions/DEPS b/components/suggestions/DEPS index 5ed69567838f56..c9c05fa07d3980 100644 --- a/components/suggestions/DEPS +++ b/components/suggestions/DEPS @@ -4,6 +4,7 @@ include_rules = [ "+components/keyed_service/core", "+components/leveldb_proto", "+components/pref_registry", + "+components/prefs", "+components/signin/core/browser", "+components/variations", "+google_apis", diff --git a/components/suggestions/blacklist_store.cc b/components/suggestions/blacklist_store.cc index fff59fcc00db2b..915fc289cb60a1 100644 --- a/components/suggestions/blacklist_store.cc +++ b/components/suggestions/blacklist_store.cc @@ -12,8 +12,8 @@ #include "base/base64.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "components/suggestions/suggestions_pref_names.h" using base::TimeDelta; diff --git a/components/suggestions/suggestions_store.cc b/components/suggestions/suggestions_store.cc index 39dac6caa9ad1e..ee53fc509334cc 100644 --- a/components/suggestions/suggestions_store.cc +++ b/components/suggestions/suggestions_store.cc @@ -9,10 +9,10 @@ #include #include "base/base64.h" -#include "base/prefs/pref_service.h" #include "base/time/default_clock.h" #include "base/time/time.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "components/suggestions/suggestions_pref_names.h" namespace suggestions { diff --git a/components/sync_bookmarks/DEPS b/components/sync_bookmarks/DEPS index 3f7c8125eaa3c7..53ccb4a78c5140 100644 --- a/components/sync_bookmarks/DEPS +++ b/components/sync_bookmarks/DEPS @@ -3,6 +3,7 @@ include_rules = [ "+components/bookmarks/test", "+components/favicon/core", "+components/history/core/browser", + "+components/prefs", "+components/sync_driver", "+components/undo", "+sync", diff --git a/components/sync_bookmarks/bookmark_data_type_controller_unittest.cc b/components/sync_bookmarks/bookmark_data_type_controller_unittest.cc index ba84fe4c23f403..362c89901789ae 100644 --- a/components/sync_bookmarks/bookmark_data_type_controller_unittest.cc +++ b/components/sync_bookmarks/bookmark_data_type_controller_unittest.cc @@ -9,13 +9,13 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/test/bookmark_test_helpers.h" #include "components/bookmarks/test/test_bookmark_client.h" #include "components/history/core/browser/history_service.h" +#include "components/prefs/testing_pref_service.h" #include "components/sync_driver/change_processor_mock.h" #include "components/sync_driver/data_type_controller_mock.h" #include "components/sync_driver/fake_sync_client.h" diff --git a/components/sync_driver/DEPS b/components/sync_driver/DEPS index dd1b4f357950db..2d6a2a389d00dc 100644 --- a/components/sync_driver/DEPS +++ b/components/sync_driver/DEPS @@ -4,6 +4,7 @@ include_rules = [ "+components/os_crypt", "+components/policy", "+components/pref_registry", + "+components/prefs", "+components/signin/core/browser", "+components/syncable_prefs", "+components/version_info", diff --git a/components/sync_driver/sync_policy_handler.cc b/components/sync_driver/sync_policy_handler.cc index e0ed944e95b341..e70b155826e07a 100644 --- a/components/sync_driver/sync_policy_handler.cc +++ b/components/sync_driver/sync_policy_handler.cc @@ -4,9 +4,9 @@ #include "components/sync_driver/sync_policy_handler.h" -#include "base/prefs/pref_value_map.h" #include "base/values.h" #include "components/policy/core/common/policy_map.h" +#include "components/prefs/pref_value_map.h" #include "components/sync_driver/pref_names.h" #include "policy/policy_constants.h" diff --git a/components/sync_driver/sync_policy_handler_unittest.cc b/components/sync_driver/sync_policy_handler_unittest.cc index 73ed7dd59b5f49..dd300d67781245 100644 --- a/components/sync_driver/sync_policy_handler_unittest.cc +++ b/components/sync_driver/sync_policy_handler_unittest.cc @@ -4,10 +4,10 @@ #include "components/sync_driver/sync_policy_handler.h" -#include "base/prefs/pref_value_map.h" #include "base/values.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_types.h" +#include "components/prefs/pref_value_map.h" #include "components/sync_driver/pref_names.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/sync_driver/sync_prefs.cc b/components/sync_driver/sync_prefs.cc index 6cebfa72bcbada..e0291423552a80 100644 --- a/components/sync_driver/sync_prefs.cc +++ b/components/sync_driver/sync_prefs.cc @@ -6,12 +6,12 @@ #include "base/base64.h" #include "base/logging.h" -#include "base/prefs/pref_member.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "build/build_config.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_member.h" +#include "components/prefs/pref_service.h" #include "components/sync_driver/pref_names.h" namespace sync_driver { diff --git a/components/sync_driver/sync_prefs.h b/components/sync_driver/sync_prefs.h index c16710cd4bf5d5..96f1a8e440bdbf 100644 --- a/components/sync_driver/sync_prefs.h +++ b/components/sync_driver/sync_prefs.h @@ -14,10 +14,10 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "base/prefs/pref_member.h" #include "base/threading/non_thread_safe.h" #include "base/time/time.h" #include "build/build_config.h" +#include "components/prefs/pref_member.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/sync_encryption_handler.h" diff --git a/components/sync_driver/sync_prefs_unittest.cc b/components/sync_driver/sync_prefs_unittest.cc index e25ec616102e43..cdbe2f4f3453eb 100644 --- a/components/sync_driver/sync_prefs_unittest.cc +++ b/components/sync_driver/sync_prefs_unittest.cc @@ -10,11 +10,11 @@ #include "base/command_line.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_notifier_impl.h" -#include "base/prefs/pref_value_store.h" -#include "base/prefs/testing_pref_service.h" #include "base/time/time.h" #include "components/pref_registry/testing_pref_service_syncable.h" +#include "components/prefs/pref_notifier_impl.h" +#include "components/prefs/pref_value_store.h" +#include "components/prefs/testing_pref_service.h" #include "components/sync_driver/pref_names.h" #include "sync/internal_api/public/base/model_type.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/components/sync_sessions/DEPS b/components/sync_sessions/DEPS index 00098e0c8f4dab..1fd82cac309022 100644 --- a/components/sync_sessions/DEPS +++ b/components/sync_sessions/DEPS @@ -2,6 +2,7 @@ include_rules = [ "+components/bookmarks/browser", "+components/favicon/core", "+components/history/core/browser", + "+components/prefs", "+components/sessions", "+components/sync_driver", "+components/variations", diff --git a/components/sync_sessions/session_data_type_controller.cc b/components/sync_sessions/session_data_type_controller.cc index 780d4780e68324..6398cb63a0182e 100644 --- a/components/sync_sessions/session_data_type_controller.cc +++ b/components/sync_sessions/session_data_type_controller.cc @@ -4,7 +4,7 @@ #include "components/sync_sessions/session_data_type_controller.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "components/sync_driver/sync_client.h" #include "components/sync_sessions/sync_sessions_client.h" #include "components/sync_sessions/synced_window_delegate.h" diff --git a/components/sync_sessions/session_data_type_controller.h b/components/sync_sessions/session_data_type_controller.h index 7892e4df9f140f..ee2249eab430d4 100644 --- a/components/sync_sessions/session_data_type_controller.h +++ b/components/sync_sessions/session_data_type_controller.h @@ -6,7 +6,7 @@ #define COMPONENTS_SYNC_SESSIONS_SESSION_DATA_TYPE_CONTROLLER_H_ #include "base/macros.h" -#include "base/prefs/pref_change_registrar.h" +#include "components/prefs/pref_change_registrar.h" #include "components/sync_driver/local_device_info_provider.h" #include "components/sync_driver/ui_data_type_controller.h" diff --git a/components/sync_sessions/session_data_type_controller_unittest.cc b/components/sync_sessions/session_data_type_controller_unittest.cc index e64f8f3dd3784f..c4974dd6c4e06c 100644 --- a/components/sync_sessions/session_data_type_controller_unittest.cc +++ b/components/sync_sessions/session_data_type_controller_unittest.cc @@ -9,10 +9,10 @@ #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "components/sync_driver/fake_sync_client.h" #include "components/sync_driver/local_device_info_provider_mock.h" #include "components/sync_driver/sync_api_component_factory_mock.h" diff --git a/components/syncable_prefs/DEPS b/components/syncable_prefs/DEPS index 2d2851debc84e3..3bfaed6bcb6778 100644 --- a/components/syncable_prefs/DEPS +++ b/components/syncable_prefs/DEPS @@ -2,6 +2,7 @@ include_rules = [ "+components/policy/core/browser", "+components/policy/core/common", "+components/pref_registry", + "+components/prefs", "+sync", # syncable_prefs can be used on all platforms, including iOS. Do not allow diff --git a/components/syncable_prefs/pref_model_associator.cc b/components/syncable_prefs/pref_model_associator.cc index dc7251f85bed64..64251f19514c5b 100644 --- a/components/syncable_prefs/pref_model_associator.cc +++ b/components/syncable_prefs/pref_model_associator.cc @@ -11,10 +11,10 @@ #include "base/json/json_string_value_serializer.h" #include "base/location.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "components/prefs/pref_service.h" #include "components/syncable_prefs/pref_model_associator_client.h" #include "components/syncable_prefs/pref_service_syncable.h" #include "sync/api/sync_change.h" diff --git a/components/syncable_prefs/pref_model_associator_unittest.cc b/components/syncable_prefs/pref_model_associator_unittest.cc index aceba18fa77737..41e4389ce0c71c 100644 --- a/components/syncable_prefs/pref_model_associator_unittest.cc +++ b/components/syncable_prefs/pref_model_associator_unittest.cc @@ -5,8 +5,8 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/values.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/syncable_prefs/pref_model_associator.h" #include "components/syncable_prefs/pref_model_associator_client.h" #include "components/syncable_prefs/pref_service_mock_factory.h" diff --git a/components/syncable_prefs/pref_service_mock_factory.cc b/components/syncable_prefs/pref_service_mock_factory.cc index 8468d05701879d..eee180bf1dee59 100644 --- a/components/syncable_prefs/pref_service_mock_factory.cc +++ b/components/syncable_prefs/pref_service_mock_factory.cc @@ -4,7 +4,7 @@ #include "components/syncable_prefs/pref_service_mock_factory.h" -#include "base/prefs/testing_pref_store.h" +#include "components/prefs/testing_pref_store.h" namespace syncable_prefs { diff --git a/components/syncable_prefs/pref_service_syncable.cc b/components/syncable_prefs/pref_service_syncable.cc index 3384fb94c108f8..c656381877d93e 100644 --- a/components/syncable_prefs/pref_service_syncable.cc +++ b/components/syncable_prefs/pref_service_syncable.cc @@ -7,14 +7,14 @@ #include "base/bind.h" #include "base/callback.h" #include "base/files/file_path.h" -#include "base/prefs/default_pref_store.h" -#include "base/prefs/overlay_user_pref_store.h" -#include "base/prefs/pref_notifier_impl.h" -#include "base/prefs/pref_registry.h" -#include "base/prefs/pref_value_store.h" #include "base/strings/string_number_conversions.h" #include "base/value_conversions.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/default_pref_store.h" +#include "components/prefs/overlay_user_pref_store.h" +#include "components/prefs/pref_notifier_impl.h" +#include "components/prefs/pref_registry.h" +#include "components/prefs/pref_value_store.h" #include "components/syncable_prefs/pref_model_associator.h" #include "components/syncable_prefs/pref_service_syncable_observer.h" diff --git a/components/syncable_prefs/pref_service_syncable.h b/components/syncable_prefs/pref_service_syncable.h index be719aaae16827..2aa7d7f61e51f4 100644 --- a/components/syncable_prefs/pref_service_syncable.h +++ b/components/syncable_prefs/pref_service_syncable.h @@ -11,8 +11,8 @@ #include "base/callback_forward.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "components/syncable_prefs/pref_model_associator.h" #include "components/syncable_prefs/synced_pref_observer.h" diff --git a/components/syncable_prefs/pref_service_syncable_factory.cc b/components/syncable_prefs/pref_service_syncable_factory.cc index 381c6125b1dc83..88eb338dcc29d2 100644 --- a/components/syncable_prefs/pref_service_syncable_factory.cc +++ b/components/syncable_prefs/pref_service_syncable_factory.cc @@ -4,11 +4,11 @@ #include "components/syncable_prefs/pref_service_syncable_factory.h" -#include "base/prefs/default_pref_store.h" -#include "base/prefs/pref_notifier_impl.h" -#include "base/prefs/pref_value_store.h" #include "base/trace_event/trace_event.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/default_pref_store.h" +#include "components/prefs/pref_notifier_impl.h" +#include "components/prefs/pref_value_store.h" #include "components/syncable_prefs/pref_service_syncable.h" #if defined(ENABLE_CONFIGURATION_POLICY) diff --git a/components/syncable_prefs/pref_service_syncable_factory.h b/components/syncable_prefs/pref_service_syncable_factory.h index 184ef097c5483e..28970a7fa64510 100644 --- a/components/syncable_prefs/pref_service_syncable_factory.h +++ b/components/syncable_prefs/pref_service_syncable_factory.h @@ -6,7 +6,7 @@ #define COMPONENTS_SYNCABLE_PREFS_PREF_SERVICE_SYNCABLE_FACTORY_H_ #include "base/macros.h" -#include "base/prefs/pref_service_factory.h" +#include "components/prefs/pref_service_factory.h" namespace base { class CommandLine; diff --git a/components/syncable_prefs/pref_service_syncable_unittest.cc b/components/syncable_prefs/pref_service_syncable_unittest.cc index 6cde73947c26de..1d72a4823b4c91 100644 --- a/components/syncable_prefs/pref_service_syncable_unittest.cc +++ b/components/syncable_prefs/pref_service_syncable_unittest.cc @@ -11,9 +11,9 @@ #include "base/json/json_writer.h" #include "base/macros.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/utf_string_conversions.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/syncable_prefs/pref_model_associator.h" #include "components/syncable_prefs/pref_model_associator_client.h" #include "components/syncable_prefs/testing_pref_service_syncable.h" diff --git a/components/syncable_prefs/testing_pref_service_syncable.cc b/components/syncable_prefs/testing_pref_service_syncable.cc index 7c61f510a31fe5..f05485a5f7d120 100644 --- a/components/syncable_prefs/testing_pref_service_syncable.cc +++ b/components/syncable_prefs/testing_pref_service_syncable.cc @@ -5,9 +5,9 @@ #include "components/syncable_prefs/testing_pref_service_syncable.h" #include "base/bind.h" -#include "base/prefs/pref_notifier_impl.h" -#include "base/prefs/pref_value_store.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_notifier_impl.h" +#include "components/prefs/pref_value_store.h" #include "testing/gtest/include/gtest/gtest.h" template <> diff --git a/components/syncable_prefs/testing_pref_service_syncable.h b/components/syncable_prefs/testing_pref_service_syncable.h index e55ce55642b77d..3be14f8cdcc102 100644 --- a/components/syncable_prefs/testing_pref_service_syncable.h +++ b/components/syncable_prefs/testing_pref_service_syncable.h @@ -6,7 +6,7 @@ #define COMPONENTS_SYNCABLE_PREFS_TESTING_PREF_SERVICE_SYNCABLE_H_ #include "base/macros.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "components/syncable_prefs/pref_service_syncable.h" namespace user_prefs { diff --git a/components/translate/DEPS b/components/translate/DEPS index 6e35d778b444d6..44769f8b679849 100644 --- a/components/translate/DEPS +++ b/components/translate/DEPS @@ -3,6 +3,7 @@ include_rules = [ "+components/infobars", "+components/language_usage_metrics", "+components/pref_registry", + "+components/prefs", "+google_apis", "+grit", # For generated headers. "+net", diff --git a/components/translate/core/browser/translate_accept_languages.cc b/components/translate/core/browser/translate_accept_languages.cc index b95a63f9588f75..3b7e87306d8eef 100644 --- a/components/translate/core/browser/translate_accept_languages.cc +++ b/components/translate/core/browser/translate_accept_languages.cc @@ -7,9 +7,9 @@ #include #include "base/bind.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" +#include "components/prefs/pref_service.h" #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/common/translate_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/components/translate/core/browser/translate_accept_languages.h b/components/translate/core/browser/translate_accept_languages.h index e4296486778496..b296c52d2e8f91 100644 --- a/components/translate/core/browser/translate_accept_languages.h +++ b/components/translate/core/browser/translate_accept_languages.h @@ -9,7 +9,7 @@ #include #include "base/macros.h" -#include "base/prefs/pref_change_registrar.h" +#include "components/prefs/pref_change_registrar.h" class PrefService; diff --git a/components/translate/core/browser/translate_download_manager.cc b/components/translate/core/browser/translate_download_manager.cc index 75a9ee6530f7e4..aebdd3dfc92d4c 100644 --- a/components/translate/core/browser/translate_download_manager.cc +++ b/components/translate/core/browser/translate_download_manager.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "components/translate/core/common/translate_pref_names.h" #include "components/translate/core/common/translate_switches.h" diff --git a/components/translate/core/browser/translate_manager.cc b/components/translate/core/browser/translate_manager.cc index 371a10f5553e83..161113113348e8 100644 --- a/components/translate/core/browser/translate_manager.cc +++ b/components/translate/core/browser/translate_manager.cc @@ -8,10 +8,10 @@ #include "base/command_line.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" +#include "components/prefs/pref_service.h" #include "components/translate/core/browser/language_state.h" #include "components/translate/core/browser/page_translated_details.h" #include "components/translate/core/browser/translate_accept_languages.h" diff --git a/components/translate/core/browser/translate_prefs.cc b/components/translate/core/browser/translate_prefs.cc index 5b3938daffa860..3a1cae37bc9a60 100644 --- a/components/translate/core/browser/translate_prefs.cc +++ b/components/translate/core/browser/translate_prefs.cc @@ -6,12 +6,12 @@ #include -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "build/build_config.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/translate/core/browser/translate_accept_languages.h" #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_experiment.h" diff --git a/components/translate/core/browser/translate_prefs.h b/components/translate/core/browser/translate_prefs.h index fa32241a0e6425..d994bb0a459cbb 100644 --- a/components/translate/core/browser/translate_prefs.h +++ b/components/translate/core/browser/translate_prefs.h @@ -12,9 +12,9 @@ #include "base/gtest_prod_util.h" #include "base/macros.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/time/time.h" #include "build/build_config.h" +#include "components/prefs/scoped_user_pref_update.h" #include "url/gurl.h" class PrefService; diff --git a/components/translate/core/browser/translate_prefs_unittest.cc b/components/translate/core/browser/translate_prefs_unittest.cc index 9c61c5dbf47ade..a4e9de32a69866 100644 --- a/components/translate/core/browser/translate_prefs_unittest.cc +++ b/components/translate/core/browser/translate_prefs_unittest.cc @@ -8,9 +8,9 @@ #include #include -#include "base/prefs/scoped_user_pref_update.h" #include "build/build_config.h" #include "components/pref_registry/testing_pref_service_syncable.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/translate/core/browser/translate_download_manager.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/translate/ios/browser/language_detection_controller.h b/components/translate/ios/browser/language_detection_controller.h index ec98439f4f2809..3422e06770de0c 100644 --- a/components/translate/ios/browser/language_detection_controller.h +++ b/components/translate/ios/browser/language_detection_controller.h @@ -12,8 +12,8 @@ #include "base/mac/scoped_nsobject.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_member.h" #include "base/strings/string16.h" +#include "components/prefs/pref_member.h" #include "ios/web/public/web_state/web_state_observer.h" class GURL; diff --git a/components/translate/ios/browser/language_detection_controller.mm b/components/translate/ios/browser/language_detection_controller.mm index 1f145d6aa08030..51976b73a4372f 100644 --- a/components/translate/ios/browser/language_detection_controller.mm +++ b/components/translate/ios/browser/language_detection_controller.mm @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_member.h" #include "base/time/time.h" +#include "components/prefs/pref_member.h" #include "components/translate/core/common/translate_pref_names.h" #include "components/translate/core/language_detection/language_detection_util.h" #import "components/translate/ios/browser/js_language_detection_manager.h" diff --git a/components/translate/ios/browser/language_detection_controller_unittest.mm b/components/translate/ios/browser/language_detection_controller_unittest.mm index e63163e37037a7..730f73d277db09 100644 --- a/components/translate/ios/browser/language_detection_controller_unittest.mm +++ b/components/translate/ios/browser/language_detection_controller_unittest.mm @@ -5,9 +5,9 @@ #import "components/translate/ios/browser/language_detection_controller.h" #include "base/mac/bind_objc_block.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/strings/utf_string_conversions.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "components/translate/core/common/translate_pref_names.h" #import "components/translate/ios/browser/js_language_detection_manager.h" #include "ios/web/public/test/test_web_state.h" diff --git a/components/ui/zoom/DEPS b/components/ui/zoom/DEPS index cdd5019e6f3036..13041bbd49d12c 100644 --- a/components/ui/zoom/DEPS +++ b/components/ui/zoom/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+components/prefs", "+content/public/browser", "+content/public/common", "+ipc", diff --git a/components/ui/zoom/page_zoom.cc b/components/ui/zoom/page_zoom.cc index 6d65d78ba72984..fd9710d94b9241 100644 --- a/components/ui/zoom/page_zoom.cc +++ b/components/ui/zoom/page_zoom.cc @@ -9,7 +9,7 @@ #include #include -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "components/ui/zoom/page_zoom_constants.h" #include "components/ui/zoom/zoom_controller.h" #include "content/public/browser/host_zoom_map.h" diff --git a/components/ui/zoom/zoom_controller.h b/components/ui/zoom/zoom_controller.h index ce6cc83b883e77..cffa5ae617981f 100644 --- a/components/ui/zoom/zoom_controller.h +++ b/components/ui/zoom/zoom_controller.h @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/pref_member.h" +#include "components/prefs/pref_member.h" #include "content/public/browser/host_zoom_map.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/components/user_manager/DEPS b/components/user_manager/DEPS index 7411deb7223d32..57a407fa28932d 100644 --- a/components/user_manager/DEPS +++ b/components/user_manager/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+chromeos/chromeos_switches.h", "+chromeos/login/user_names.h", +"+components/prefs", "+components/session_manager/core/session_manager.h", "+components/signin/core/account_id/account_id.h", "+google_apis/gaia/gaia_auth_util.h", diff --git a/components/user_manager/known_user.cc b/components/user_manager/known_user.cc index 18c1fac6fc4f25..973e12b78ee890 100644 --- a/components/user_manager/known_user.cc +++ b/components/user_manager/known_user.cc @@ -8,9 +8,9 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/values.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/user_manager/user_manager.h" #include "google_apis/gaia/gaia_auth_util.h" diff --git a/components/user_manager/user_manager_base.cc b/components/user_manager/user_manager_base.cc index 00d81e7f996cff..c45efefd6ec608 100644 --- a/components/user_manager/user_manager_base.cc +++ b/components/user_manager/user_manager_base.cc @@ -17,14 +17,14 @@ #include "base/logging.h" #include "base/macros.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/task_runner.h" #include "base/values.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/session_manager/core/session_manager.h" #include "components/user_manager/known_user.h" #include "components/user_manager/remove_user_delegate.h" diff --git a/components/user_prefs/DEPS b/components/user_prefs/DEPS index 9ca65e36d8e1dd..4adeae9aa95e28 100644 --- a/components/user_prefs/DEPS +++ b/components/user_prefs/DEPS @@ -3,4 +3,6 @@ include_rules = [ # platform-specific dependencies. "-content", "-ios", + + "+components/prefs", ] diff --git a/components/user_prefs/tracked/dictionary_hash_store_contents.cc b/components/user_prefs/tracked/dictionary_hash_store_contents.cc index 40494afeb8ed93..403437b62c2e2f 100644 --- a/components/user_prefs/tracked/dictionary_hash_store_contents.cc +++ b/components/user_prefs/tracked/dictionary_hash_store_contents.cc @@ -7,9 +7,9 @@ #include "base/callback.h" #include "base/logging.h" #include "base/macros.h" -#include "base/prefs/persistent_pref_store.h" #include "base/values.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/persistent_pref_store.h" namespace { diff --git a/components/user_prefs/tracked/interceptable_pref_filter.h b/components/user_prefs/tracked/interceptable_pref_filter.h index 58021df319cd90..ae39d02c156444 100644 --- a/components/user_prefs/tracked/interceptable_pref_filter.h +++ b/components/user_prefs/tracked/interceptable_pref_filter.h @@ -7,8 +7,8 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_filter.h" #include "base/values.h" +#include "components/prefs/pref_filter.h" // A partial implementation of a PrefFilter whose FilterOnLoad call may be // intercepted by a FilterOnLoadInterceptor. Implementations of diff --git a/components/user_prefs/tracked/pref_hash_filter.cc b/components/user_prefs/tracked/pref_hash_filter.cc index f77aaedd6e5ebf..6d8e628594ca95 100644 --- a/components/user_prefs/tracked/pref_hash_filter.cc +++ b/components/user_prefs/tracked/pref_hash_filter.cc @@ -11,12 +11,12 @@ #include "base/logging.h" #include "base/macros.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/pref_store.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" #include "base/values.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/pref_store.h" #include "components/user_prefs/tracked/dictionary_hash_store_contents.h" #include "components/user_prefs/tracked/pref_hash_store.h" #include "components/user_prefs/tracked/pref_hash_store_transaction.h" diff --git a/components/user_prefs/tracked/pref_hash_filter_unittest.cc b/components/user_prefs/tracked/pref_hash_filter_unittest.cc index 9eceefcb1a7a2e..adf2bf3613eb89 100644 --- a/components/user_prefs/tracked/pref_hash_filter_unittest.cc +++ b/components/user_prefs/tracked/pref_hash_filter_unittest.cc @@ -22,8 +22,8 @@ #include "base/metrics/histogram_base.h" #include "base/metrics/histogram_samples.h" #include "base/metrics/statistics_recorder.h" -#include "base/prefs/testing_pref_store.h" #include "base/values.h" +#include "components/prefs/testing_pref_store.h" #include "components/user_prefs/tracked/hash_store_contents.h" #include "components/user_prefs/tracked/mock_validation_delegate.h" #include "components/user_prefs/tracked/pref_hash_store.h" diff --git a/components/user_prefs/tracked/pref_service_hash_store_contents.cc b/components/user_prefs/tracked/pref_service_hash_store_contents.cc index 122fa4724136bb..8f8329ec4c44c5 100644 --- a/components/user_prefs/tracked/pref_service_hash_store_contents.cc +++ b/components/user_prefs/tracked/pref_service_hash_store_contents.cc @@ -4,10 +4,10 @@ #include "components/user_prefs/tracked/pref_service_hash_store_contents.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/values.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" namespace { diff --git a/components/user_prefs/tracked/pref_service_hash_store_contents_unittest.cc b/components/user_prefs/tracked/pref_service_hash_store_contents_unittest.cc index 09003d9ecdd0b0..3cfb10542af890 100644 --- a/components/user_prefs/tracked/pref_service_hash_store_contents_unittest.cc +++ b/components/user_prefs/tracked/pref_service_hash_store_contents_unittest.cc @@ -6,9 +6,9 @@ #include -#include "base/prefs/pref_service.h" -#include "base/prefs/testing_pref_service.h" #include "base/values.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" class PrefServiceHashStoreContentsTest : public testing::Test { diff --git a/components/user_prefs/tracked/segregated_pref_store.h b/components/user_prefs/tracked/segregated_pref_store.h index c1960c07e2e3ff..249f5f2d90c7df 100644 --- a/components/user_prefs/tracked/segregated_pref_store.h +++ b/components/user_prefs/tracked/segregated_pref_store.h @@ -15,7 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/persistent_pref_store.h" +#include "components/prefs/persistent_pref_store.h" // Provides a unified PersistentPrefStore implementation that splits its storage // and retrieval between two underlying PersistentPrefStore instances: a set of diff --git a/components/user_prefs/tracked/segregated_pref_store_unittest.cc b/components/user_prefs/tracked/segregated_pref_store_unittest.cc index 1986758c1f3315..da8df8fa1a80d4 100644 --- a/components/user_prefs/tracked/segregated_pref_store_unittest.cc +++ b/components/user_prefs/tracked/segregated_pref_store_unittest.cc @@ -12,10 +12,10 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/persistent_pref_store.h" -#include "base/prefs/pref_store_observer_mock.h" -#include "base/prefs/testing_pref_store.h" #include "base/values.h" +#include "components/prefs/persistent_pref_store.h" +#include "components/prefs/pref_store_observer_mock.h" +#include "components/prefs/testing_pref_store.h" #include "components/user_prefs/tracked/segregated_pref_store.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/user_prefs/tracked/tracked_preferences_migration_unittest.cc b/components/user_prefs/tracked/tracked_preferences_migration_unittest.cc index cba3bf221d4271..f6e380dde9af6f 100644 --- a/components/user_prefs/tracked/tracked_preferences_migration_unittest.cc +++ b/components/user_prefs/tracked/tracked_preferences_migration_unittest.cc @@ -13,9 +13,9 @@ #include "base/callback.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" #include "base/strings/string_split.h" #include "base/values.h" +#include "components/prefs/testing_pref_service.h" #include "components/user_prefs/tracked/dictionary_hash_store_contents.h" #include "components/user_prefs/tracked/hash_store_contents.h" #include "components/user_prefs/tracked/interceptable_pref_filter.h" diff --git a/components/user_prefs/user_prefs.cc b/components/user_prefs/user_prefs.cc index 3ddff9bfc10902..493c50eac77d10 100644 --- a/components/user_prefs/user_prefs.cc +++ b/components/user_prefs/user_prefs.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" namespace user_prefs { diff --git a/components/variations/DEPS b/components/variations/DEPS index bd38a5ca56685c..720e034fc7f9dd 100644 --- a/components/variations/DEPS +++ b/components/variations/DEPS @@ -4,6 +4,7 @@ include_rules = [ "-components", "+components/compression", "+components/crash/core/common", + "+components/prefs", "+components/variations", "+crypto", "-net", diff --git a/components/variations/caching_permuted_entropy_provider.cc b/components/variations/caching_permuted_entropy_provider.cc index f1ae8afb8a3513..d1788c40a6c575 100644 --- a/components/variations/caching_permuted_entropy_provider.cc +++ b/components/variations/caching_permuted_entropy_provider.cc @@ -8,8 +8,8 @@ #include "base/base64.h" #include "base/logging.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/variations/pref_names.h" namespace metrics { diff --git a/components/variations/caching_permuted_entropy_provider_unittest.cc b/components/variations/caching_permuted_entropy_provider_unittest.cc index 1b1095bc7f60d0..c7139d8e1e2970 100644 --- a/components/variations/caching_permuted_entropy_provider_unittest.cc +++ b/components/variations/caching_permuted_entropy_provider_unittest.cc @@ -9,7 +9,7 @@ #include #include "base/macros.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace metrics { diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc index f03fa71ed23d7a..9e0c4c75134475 100644 --- a/components/variations/service/variations_service.cc +++ b/components/variations/service/variations_service.cc @@ -12,8 +12,6 @@ #include "base/command_line.h" #include "base/metrics/histogram.h" #include "base/metrics/sparse_histogram.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/sys_info.h" #include "base/task_runner_util.h" @@ -25,6 +23,8 @@ #include "components/metrics/metrics_state_manager.h" #include "components/network_time/network_time_tracker.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/variations/pref_names.h" #include "components/variations/proto/variations_seed.pb.h" #include "components/variations/variations_seed_processor.h" diff --git a/components/variations/service/variations_service_unittest.cc b/components/variations/service/variations_service_unittest.cc index 572aa6d9ba1065..aea08e39f8a39c 100644 --- a/components/variations/service/variations_service_unittest.cc +++ b/components/variations/service/variations_service_unittest.cc @@ -13,13 +13,13 @@ #include "base/json/json_string_value_serializer.h" #include "base/macros.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/testing_pref_service.h" #include "base/sha1.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/test/histogram_tester.h" #include "base/version.h" +#include "components/prefs/testing_pref_service.h" #include "components/variations/pref_names.h" #include "components/variations/proto/study.pb.h" #include "components/variations/proto/variations_seed.pb.h" diff --git a/components/variations/variations_request_scheduler_mobile.cc b/components/variations/variations_request_scheduler_mobile.cc index abc778d31ff903..18a3ad1eb19e49 100644 --- a/components/variations/variations_request_scheduler_mobile.cc +++ b/components/variations/variations_request_scheduler_mobile.cc @@ -4,7 +4,7 @@ #include "components/variations/variations_request_scheduler_mobile.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "components/variations/pref_names.h" namespace variations { diff --git a/components/variations/variations_request_scheduler_mobile_unittest.cc b/components/variations/variations_request_scheduler_mobile_unittest.cc index e00c6b7dc86bdd..3f1e8e94985ce3 100644 --- a/components/variations/variations_request_scheduler_mobile_unittest.cc +++ b/components/variations/variations_request_scheduler_mobile_unittest.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "components/variations/pref_names.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/variations/variations_seed_store.cc b/components/variations/variations_seed_store.cc index 2d8aa033564079..716bb0553a998c 100644 --- a/components/variations/variations_seed_store.cc +++ b/components/variations/variations_seed_store.cc @@ -10,11 +10,11 @@ #include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_math.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/sha1.h" #include "base/strings/string_number_conversions.h" #include "build/build_config.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/variations/pref_names.h" #include "components/variations/proto/variations_seed.pb.h" #include "crypto/signature_verifier.h" diff --git a/components/variations/variations_seed_store_unittest.cc b/components/variations/variations_seed_store_unittest.cc index 2ebdb4d299cfbf..577e3f8c450479 100644 --- a/components/variations/variations_seed_store_unittest.cc +++ b/components/variations/variations_seed_store_unittest.cc @@ -6,8 +6,8 @@ #include "base/base64.h" #include "base/macros.h" -#include "base/prefs/testing_pref_service.h" #include "build/build_config.h" +#include "components/prefs/testing_pref_service.h" #include "components/variations/pref_names.h" #include "components/variations/proto/study.pb.h" #include "components/variations/proto/variations_seed.pb.h" diff --git a/components/wallpaper/DEPS b/components/wallpaper/DEPS index 4dfc34042389b7..199c7fc8d7b082 100644 --- a/components/wallpaper/DEPS +++ b/components/wallpaper/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+components/prefs", "+skia/ext", "+third_party/skia/include", "+ui/gfx", diff --git a/components/wallpaper/wallpaper_manager_base.cc b/components/wallpaper/wallpaper_manager_base.cc index 41a5c757aa9ae5..6cd4d62bc481ca 100644 --- a/components/wallpaper/wallpaper_manager_base.cc +++ b/components/wallpaper/wallpaper_manager_base.cc @@ -13,9 +13,6 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" @@ -23,6 +20,9 @@ #include "base/threading/worker_pool.h" #include "base/time/time.h" #include "base/values.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/signin/core/account_id/account_id.h" #include "components/user_manager/user.h" #include "components/user_manager/user_image/user_image.h" diff --git a/components/web_cache/DEPS b/components/web_cache/DEPS new file mode 100644 index 00000000000000..eac076192dcda9 --- /dev/null +++ b/components/web_cache/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+components/prefs", +] diff --git a/components/web_cache/browser/web_cache_manager.cc b/components/web_cache/browser/web_cache_manager.cc index 7d43b4595e7866..4583656ef225f2 100644 --- a/components/web_cache/browser/web_cache_manager.cc +++ b/components/web_cache/browser/web_cache_manager.cc @@ -13,12 +13,12 @@ #include "base/location.h" #include "base/memory/singleton.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" #include "base/sys_info.h" #include "base/thread_task_runner_handle.h" #include "base/time/time.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/web_cache/common/web_cache_messages.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" diff --git a/components/web_resource/DEPS b/components/web_resource/DEPS index 5379387f134a49..71127972691686 100644 --- a/components/web_resource/DEPS +++ b/components/web_resource/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+components/google/core", "+components/pref_registry", + "+components/prefs", "+components/version_info", "+net", "+ui/base", diff --git a/components/web_resource/eula_accepted_notifier.cc b/components/web_resource/eula_accepted_notifier.cc index b4ff13fc814079..9f01882bf8df8c 100644 --- a/components/web_resource/eula_accepted_notifier.cc +++ b/components/web_resource/eula_accepted_notifier.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" +#include "components/prefs/pref_service.h" #include "components/web_resource/web_resource_pref_names.h" namespace web_resource { diff --git a/components/web_resource/eula_accepted_notifier.h b/components/web_resource/eula_accepted_notifier.h index 6a05b06275937b..b386e1f3dfe0d6 100644 --- a/components/web_resource/eula_accepted_notifier.h +++ b/components/web_resource/eula_accepted_notifier.h @@ -6,7 +6,7 @@ #define COMPONENTS_WEB_RESOURCE_EULA_ACCEPTED_NOTIFIER_H_ #include "base/macros.h" -#include "base/prefs/pref_change_registrar.h" +#include "components/prefs/pref_change_registrar.h" class PrefService; diff --git a/components/web_resource/eula_accepted_notifier_unittest.cc b/components/web_resource/eula_accepted_notifier_unittest.cc index b88156f4fa832a..f4ecd31a631983 100644 --- a/components/web_resource/eula_accepted_notifier_unittest.cc +++ b/components/web_resource/eula_accepted_notifier_unittest.cc @@ -5,8 +5,8 @@ #include "components/web_resource/eula_accepted_notifier.h" #include "base/macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "components/web_resource/web_resource_pref_names.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/web_resource/notification_promo.cc b/components/web_resource/notification_promo.cc index f0e9e71f76517a..e37c84447a540e 100644 --- a/components/web_resource/notification_promo.cc +++ b/components/web_resource/notification_promo.cc @@ -11,8 +11,6 @@ #include "base/bind.h" #include "base/macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -22,6 +20,8 @@ #include "base/values.h" #include "build/build_config.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/version_info/version_info.h" #include "components/web_resource/promo_resource_service.h" #include "net/base/url_util.h" diff --git a/components/web_resource/promo_resource_service.cc b/components/web_resource/promo_resource_service.cc index 6d3f6a7dcdf6f2..47c3e659364222 100644 --- a/components/web_resource/promo_resource_service.cc +++ b/components/web_resource/promo_resource_service.cc @@ -10,14 +10,14 @@ #include "base/command_line.h" #include "base/location.h" #include "base/macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/threading/thread_restrictions.h" #include "base/values.h" #include "build/build_config.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/web_resource/notification_promo.h" #include "components/web_resource/web_resource_pref_names.h" #include "components/web_resource/web_resource_switches.h" diff --git a/components/web_resource/promo_resource_service_mobile_ntp_unittest.cc b/components/web_resource/promo_resource_service_mobile_ntp_unittest.cc index e7387bc8699446..8d4d17778b4b0d 100644 --- a/components/web_resource/promo_resource_service_mobile_ntp_unittest.cc +++ b/components/web_resource/promo_resource_service_mobile_ntp_unittest.cc @@ -8,11 +8,11 @@ #include "base/json/json_reader.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/testing_pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "base/values.h" +#include "components/prefs/testing_pref_service.h" #include "components/version_info/version_info.h" #include "components/web_resource/notification_promo.h" #include "components/web_resource/notification_promo_mobile_ntp.h" diff --git a/components/web_resource/promo_resource_service_unittest.cc b/components/web_resource/promo_resource_service_unittest.cc index 1e07b1a2e58f12..c283523fa7872b 100644 --- a/components/web_resource/promo_resource_service_unittest.cc +++ b/components/web_resource/promo_resource_service_unittest.cc @@ -10,12 +10,12 @@ #include "base/bind.h" #include "base/json/json_reader.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/testing_pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "base/values.h" +#include "components/prefs/testing_pref_service.h" #include "components/version_info/version_info.h" #include "components/web_resource/notification_promo.h" #include "net/url_request/test_url_fetcher_factory.h" diff --git a/components/web_resource/resource_request_allowed_notifier_unittest.cc b/components/web_resource/resource_request_allowed_notifier_unittest.cc index 557faff443e021..10db8ab3e3aaca 100644 --- a/components/web_resource/resource_request_allowed_notifier_unittest.cc +++ b/components/web_resource/resource_request_allowed_notifier_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/macros.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "components/web_resource/eula_accepted_notifier.h" #include "components/web_resource/resource_request_allowed_notifier_test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/web_resource/web_resource_service.cc b/components/web_resource/web_resource_service.cc index 3c6dafafda4413..18f97a926684aa 100644 --- a/components/web_resource/web_resource_service.cc +++ b/components/web_resource/web_resource_service.cc @@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/location.h" -#include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -15,6 +14,7 @@ #include "base/time/time.h" #include "base/values.h" #include "components/google/core/browser/google_util.h" +#include "components/prefs/pref_service.h" #include "net/base/load_flags.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_context_getter.h"