Update components for new prefs location.

This is a search-and-replace update for includes with "base/prefs" -> "components/prefs" and the headers re-sorted. DEPS files were updated to allow the components in question to depend on components/prefs. This should be a no-op from a build perspective. BUG=583034 Review URL: https://codereview.chromium.org/1651203002 Cr-Commit-Position: refs/heads/master@{#372780}
author: brettw <brettw@chromium.org> 2016-02-01 14:11:38 -0800
committer: Commit bot <commit-bot@chromium.org> 2016-02-01 22:12:35 +0000
commit: f00b9b402a67812bff2fc2372690ab561e93b416 (patch)
tree: 900b483366a96c879470e6dd258a544084b43b8a
parent: 2a1a66fe10ab3d4de81b891497f4d25037e09af1 (diff)
download: chromium_src-f00b9b402a67812bff2fc2372690ab561e93b416.zip
chromium_src-f00b9b402a67812bff2fc2372690ab561e93b416.tar.gz
chromium_src-f00b9b402a67812bff2fc2372690ab561e93b416.tar.bz2
259 files changed, 426 insertions, 391 deletions
diff --git a/components/arc/DEPS b/components/arc/DEPS
index 6f780e7..2f5f4b8 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 0760288..18e44a7 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 dd9ecc3..bed4f0a 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 013bbac..3a6805b 100644
--- a/components/autofill/core/browser/autocomplete_history_manager.cc
+++ b/components/autofill/core/browser/autocomplete_history_manager.cc
@@ -6,7 +6,6 @@
 
 #include <vector>
 
-#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 b76f10a..7acafda 100644
--- a/components/autofill/core/browser/autocomplete_history_manager.h
+++ b/components/autofill/core/browser/autocomplete_history_manager.h
@@ -8,8 +8,8 @@
 #include <vector>
 
 #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 8657acb..2898844 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 9204d85..c35d100 100644
--- a/components/metrics/metrics_log_manager_unittest.cc
+++ b/components/metrics/metrics_log_manager_unittest.cc
@@ -10,11 +10,11 @@
 #include <utility>
 #include <vector>
 
-#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 c246e5c..5154cd7 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 98c1456..a69d8e8 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 ce301c9..ac04ba9 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 e6511b1..9b734c1 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 b7e224c..1050a0b 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 609b298..72280ae 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 8228e21..c78ecec25 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 5bd3b55..b4a79a7 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 1f863c0..52b91f0 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 <windows.h>  // Needed for STATUS_* codes
diff --git a/components/metrics/stability_metrics_helper_unittest.cc b/components/metrics/stability_metrics_helper_unittest.cc
index 982c4ec..6ca84df 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 0000000..eac0761
--- /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 470a8e8..8bee5aa 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 c2133fd..f86149b 100644
--- a/components/network_time/network_time_tracker_unittest.cc
+++ b/components/network_time/network_time_tracker_unittest.cc
@@ -8,8 +8,8 @@
 #include <stdint.h>
 
 #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 5b290ee..8c5d335 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 6c1c3857..40d8401 100644
--- a/components/omnibox/browser/bookmark_provider.cc
+++ b/components/omnibox/browser/bookmark_provider.cc
@@ -9,7 +9,6 @@
 #include <vector>
 
 #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 59998aa..438efb9 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 8531c0e..666138c 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 a7a4b01..9361023 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 c75618e..8dcb8d6 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 dcea1d2..55cab0e 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 e1f7be7..956c245 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 8771794..e198556 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 8c2766e..273714c 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 8871234..3093293 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 be30713..60dfbed3 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 f903a2b..204f09a 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 <string>
 
 #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 54c23b6..4e21edb 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 <ostream>
 
 #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 1d94403..56cc198 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 38a68a6..a3fb762 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 <vector>
 
 #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 4b9ae60..02da27f 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 a870a1d..5e4c0c6 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 da7b44a..8efb55d 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 <map>
 
 #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 30861b1..c63ac27 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 <utility>
 
 #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 9c05f74..fefeba0 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 4b1476d..2cd4cda 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 7dc8671..889506b 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 86fa898..3fb7eb3 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 f70fe40..986a090 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 aa457c5..4db2247 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 a043fe1..f4908c0 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 fff61fe..a1d62f8 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 b6f236c..1404838 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 57db6d6..3e508c4 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 dc62a70a..70fe246 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 df5da53..a410427 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 d4b2599..68e84d3 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 d6dfc75..dd943c4 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 ffc8dac..0496291 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 23e6734d..2f081ec 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 5e6e7f5..5b56c8b 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 6bfa20e..51270ba 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 <utility>
 
 #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 d0740a7..8296ab7 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 fd8e9ef..956497d 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 ed026d2..935dc04 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 d843af0..b6fdea5 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 db6a3ec..bfe95ea 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 b95c16e..04d3076 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 3e6a588..f6746f2 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 6d5a0c2..85ce941 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 e8a01ac..81775b5e 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 d38db70..cf0baea 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 e7cf2c6f..48dd821 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 ce15ea0..a81cea0 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 88c3b01..cc3e6b0 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 2260293..7595b2c 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<PrefService, user_prefs::PrefRegistrySyncable>::
diff --git a/components/pref_registry/testing_pref_service_syncable.h b/components/pref_registry/testing_pref_service_syncable.h
index e20f9cb..80a11a1 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 b08ef7a..79867e9 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 <utility>
 
diff --git a/components/prefs/default_pref_store.h b/components/prefs/default_pref_store.h
index ac5364d..af7306d 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 597ca55..06cabc0 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 ffc750e..65b6f91 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 <stddef.h>
 
@@ -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 6342977..30c1642 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 bc9eeca..621b895 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 <stdint.h>
 
@@ -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 96b7197..7ac2cd7 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 3030fab..b1ea0ad 100644
--- a/components/prefs/mock_pref_change_callback.h
+++ b/components/prefs/mock_pref_change_callback.h
@@ -7,8 +7,8 @@
 
 #include <string>
 
-#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 dd5b68e..ff93c64 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 <utility>
 
diff --git a/components/prefs/overlay_user_pref_store.h b/components/prefs/overlay_user_pref_store.h
index 35ada57..92875a6 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 bf5e6a5..fd30ccb 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 89c7a71..51d9656 100644
--- a/components/prefs/persistent_pref_store.h
+++ b/components/prefs/persistent_pref_store.h
@@ -7,8 +7,8 @@
 
 #include <string>
 
-#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 13193484..0030933 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 cd5a233..5e5b6a8 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 da425cf..ab35092 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 82a44c6..bb4847b 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 934237d..b848d72 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 <utility>
 
 #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 4290c0d..8ca9789 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 a776e2c..73b6ed0 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 7ae5fe6..b3d5660 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 6e62e23..bd26d03 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 cb3c3b5..a3f1234 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 77fb9a5..b7c91de 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 7e141d8..56755ca 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 b5c73e2..4874261 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 6afc012..4348029 100644
--- a/components/prefs/pref_registry_simple.h
+++ b/components/prefs/pref_registry_simple.h
@@ -10,8 +10,8 @@
 #include <string>
 
 #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 077bb1d..aaf9fa7 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 <algorithm>
 #include <utility>
@@ -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 bec7830..7b94cb6 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 2380a86..e8b9bb4 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 f84e037..b56fb23 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 649c35f..8500cf6 100644
--- a/components/prefs/pref_service_unittest.cc
+++ b/components/prefs/pref_service_unittest.cc
@@ -8,15 +8,15 @@
 #include <string>
 
 #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 f286a33..2ae0afc 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 f95c8c4..6f0c16b 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 f1a31bb..a03c858 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 1b24b4e..107aeb3 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 2340e3c..7b267cc 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 <map>
 #include <utility>
diff --git a/components/prefs/pref_value_map.h b/components/prefs/pref_value_map.h
index 349fe68..56c32b0 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 f78c999..04001a2 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 fe7cd67..4c7a4e5 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 <stddef.h>
 
 #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 8ec8c59..3a2bf15 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 e214adf..90ee7d6 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 1440a57..dfba334 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 29ad852..5a2c3ae 100644
--- a/components/prefs/scoped_user_pref_update.h
+++ b/components/prefs/scoped_user_pref_update.h
@@ -11,10 +11,10 @@
 #include <string>
 
 #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 48e3dc4..437dff6 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 5899376..1dd760e 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 85a2879..5391c51 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 33e1dc2..45c608c 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 <utility>
 
diff --git a/components/prefs/testing_pref_store.h b/components/prefs/testing_pref_store.h
index 713e69a..e2a5997 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 fdb087f..fe2c808 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 <algorithm>
 #include <utility>
diff --git a/components/prefs/value_map_pref_store.h b/components/prefs/value_map_pref_store.h
index eac785d..517d07e 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 f7da279..94754d3 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 5b55479..aa6fded 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 8bf905e..36425f0 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 54a74a0..5a9256f 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 a931cc8..8736bae 100644
--- a/components/proximity_auth/cryptauth/cryptauth_device_manager.cc
+++ b/components/proximity_auth/cryptauth/cryptauth_device_manager.cc
@@ -8,9 +8,9 @@
 #include <utility>
 
 #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 e70f5a9..61074e9 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 22d97ec..52b288c 100644
--- a/components/proximity_auth/cryptauth/cryptauth_enrollment_manager.cc
+++ b/components/proximity_auth/cryptauth/cryptauth_enrollment_manager.cc
@@ -7,10 +7,10 @@
 #include <utility>
 
 #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 99756d0..135a42f 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 3b4bbfa..2746c75 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 834e42a..588ddcf 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 89fbbd8..e07ec34 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 f28e110..20c49c1 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 17a9776..662dfe4 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 5ef9f17..80ab97e 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 0a84ee1..069741e 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 72a0860..378923e 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 0f0aba1..2f14ed7 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 ba59df6..f28d61a 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 68455c7..21030ec 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 3606b32..20894fd 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 f64f454..29e5d61 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 b475dbc..711722d 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 6cb48f6..56e85db 100644
--- a/components/rappor/test_rappor_service.h
+++ b/components/rappor/test_rappor_service.h
@@ -12,7 +12,7 @@
 #include <string>
 
 #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 464f224..3fe9684 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 15b0083..22cfb06 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 2261d1b..774bf27 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 e0362e9..d838993 100644
--- a/components/search_engines/default_search_policy_handler.cc
+++ b/components/search_engines/default_search_policy_handler.cc
@@ -8,12 +8,12 @@
 #include <utility>
 
 #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 c85db9b..344a8d4 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 b1bae71..d741c93 100644
--- a/components/search_engines/desktop_search_win.cc
+++ b/components/search_engines/desktop_search_win.cc
@@ -7,9 +7,9 @@
 #include <string>
 
 #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 4127ce6..cff4ee7 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 eae5a84..40d2008 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 ecc910b..c56da71 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 1247ce2..e3c22c16 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 e89fe67..d690007 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 0a32c7a..c4eb2f1 100644
--- a/components/security_interstitials/core/controller_client.cc
+++ b/components/security_interstitials/core/controller_client.cc
@@ -6,8 +6,8 @@
 
 #include <utility>
 
-#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 b27e97e..89ffc6d 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 3c2aa80..349d7a2 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 1902fcc..0c8fe58 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 a048589..1296590 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 1dabd81..1a60908 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 <algorithm>
 #include <vector>
 
-#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 cabf4aa..2071eea 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 23a0b26..bd0bff9 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 c36874a..edcb3a6 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 c7764d1..bc4c51d 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 527b233..2e70ebe 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 0bfbfbe..a4a8585 100644
--- a/components/signin/core/browser/signin_investigator.h
+++ b/components/signin/core/browser/signin_investigator.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #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 4fefc64..0f5d25f 100644
--- a/components/signin/core/browser/signin_investigator_unittest.cc
+++ b/components/signin/core/browser/signin_investigator_unittest.cc
@@ -4,9 +4,9 @@
 
 #include <string>
 
-#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 b2432d8..10e6ce3 100644
--- a/components/signin/core/browser/signin_manager.cc
+++ b/components/signin/core/browser/signin_manager.cc
@@ -8,11 +8,11 @@
 #include <vector>
 
 #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 91f5266..d539db7 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 cd3d9cd..efbb7e4 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 d99f5c1..b4786d6 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 39cc25d..6c7c806 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 3e7fa20..80c9ae0 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 2771bd0..364a3d4 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 198af50..0fa195e 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 aaa7070..8d8cf5c 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 85cbc20..72b8818 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 08f123b..30766b4 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 8e18935..31890eb 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 5ed6956..c9c05fa 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 fff59fc..915fc28 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 39dac6c..ee53fc5 100644
--- a/components/suggestions/suggestions_store.cc
+++ b/components/suggestions/suggestions_store.cc
@@ -9,10 +9,10 @@
 #include <utility>
 
 #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 3f7c812..53ccb4a 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 ba84fe4..362c899 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 dd1b4f3..2d6a2a3 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 e0ed944..e70b155 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 73ed7dd..dd300d67 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 6cebfa7..e029142 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 c16710c..96f1a8e 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 e25ec61..cdbe2f4 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 00098e0..1fd82ca 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 780d478..6398cb6 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 7892e4d..ee2249e 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 e64f8f3..c4974dd 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 2d2851d..3bfaed6 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 dc7251f..64251f1 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 aceba18..41e4389 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 8468d05..eee180b 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 3384fb9..c656381 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 be719aa..2aa7d7f 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 381c612..88eb338 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 184ef09..28970a7 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 6cde739..1d72a48 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 7c61f51..f05485a 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 e55ce55..3be14f8 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 6e35d77..44769f8b 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 b95a63f..3b7e873 100644
--- a/components/translate/core/browser/translate_accept_languages.cc
+++ b/components/translate/core/browser/translate_accept_languages.cc
@@ -7,9 +7,9 @@
 #include <stddef.h>
 
 #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 e429648..b296c52 100644
--- a/components/translate/core/browser/translate_accept_languages.h
+++ b/components/translate/core/browser/translate_accept_languages.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #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 75a9ee65..aebdd3d 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 371a10f..1611131 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 5b3938d..3a1cae3 100644
--- a/components/translate/core/browser/translate_prefs.cc
+++ b/components/translate/core/browser/translate_prefs.cc
@@ -6,12 +6,12 @@
 
 #include <set>
 
-#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 fa32241a..d994bb0 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 9c61c5d..a4e9de3 100644
--- a/components/translate/core/browser/translate_prefs_unittest.cc
+++ b/components/translate/core/browser/translate_prefs_unittest.cc
@@ -8,9 +8,9 @@
 #include <string>
 #include <vector>
 
-#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 ec98439..3422e06 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 1f145d6..51976b7 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 e63163e..730f73d 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 cdd5019..13041bb 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 6d65d78..fd9710d9 100644
--- a/components/ui/zoom/page_zoom.cc
+++ b/components/ui/zoom/page_zoom.cc
@@ -9,7 +9,7 @@
 #include <algorithm>
 #include <cmath>
 
-#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 ce6cc83..cffa5ae6 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 7411deb..57a407f 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 18c1fac..973e12b 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 00d81e7..c45efef 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 9ca65e3..4adeae9 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 40494af..403437b 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 58021df..ae39d02 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 f77aaed..6d8e628 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 9eceefc..adf2bf36 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 122fa47..8f8329e 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 09003d9..3cfb105 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 <string>
 
-#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 c1960c0..249f5f2 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 1986758..da8df8f 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 cba3bf2..f6e380d 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 3ddff9b..493c50e 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 bd38a5c..720e034 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 f1ae8af..d1788c4 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 1b1095b..c7139d8 100644
--- a/components/variations/caching_permuted_entropy_provider_unittest.cc
+++ b/components/variations/caching_permuted_entropy_provider_unittest.cc
@@ -9,7 +9,7 @@
 #include <string>
 
 #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 f03fa71..9e0c4c7 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 572aa6d..aea08e3 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 abc778d..18a3ad1 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 e00c6b7..3f1e8e9 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 2d8aa03..716bb05 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 2ebdb4d..577e3f8 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 4dfc340..199c7fc 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 41a5c75..6cd4d62 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 0000000..eac0761
--- /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 7d43b45..4583656 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 5379387..7112797 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 b4ff13f..9f01882 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 6a05b06..b386e1f 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 b88156f..f4ecd31 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 f0e9e71..e37c844 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 6d3f6a7d..47c3e65 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 e7387bc..8d4d177 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 1e07b1a..c283523 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 557faff..10db8ab 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 3c6dafa..18f97a9 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"
author	brettw <brettw@chromium.org>	2016-02-01 14:11:38 -0800
committer	Commit bot <commit-bot@chromium.org>	2016-02-01 22:12:35 +0000
commit	f00b9b402a67812bff2fc2372690ab561e93b416 (patch)
tree	900b483366a96c879470e6dd258a544084b43b8a
parent	2a1a66fe10ab3d4de81b891497f4d25037e09af1 (diff)
download	chromium_src-f00b9b402a67812bff2fc2372690ab561e93b416.zip chromium_src-f00b9b402a67812bff2fc2372690ab561e93b416.tar.gz chromium_src-f00b9b402a67812bff2fc2372690ab561e93b416.tar.bz2