Revert of Delete base/prefs and update callers to use components. (patchset #3 id:40001 of https://codereview.chromium.org/1662523004/ )

Reason for revert:
Broke Win Builder compile:
https://build.chromium.org/p/chromium.win/builders/Win%20Builder/builds/19463/steps/compile/logs/stdio

Original issue's description:
> Delete base/prefs and update callers to use components.
>
> Deletes the forwarding headers in base/prefs.
>
> Updates the remaining users of base/prefs includes to use components/prefs.
> Sort headers in updated files.
>
> Move PrefServiceFactory out of the base namespace. Update users.
>
> Update all preprocessor stuff in components/prefs to change BASE_PREFS_ to
> COMPONENTS_PREFS_.
>
> Add components/prefs to DEPS file of directories where checkdeps fails after
> the update.
>
> BUG=583034
>
> Committed: https://crrev.com/1f5feb7e317e3c257090858e950273b64a2e31ef
> Cr-Commit-Position: refs/heads/master@{#373105}

TBR=estade@chromium.org,brettw@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=583034

Review URL: https://codereview.chromium.org/1662843002

Cr-Commit-Position: refs/heads/master@{#373115}

13 files changed, 21 insertions, 22 deletions

diff --git a/extensions/DEPS b/extensions/DEPS
index 52dbb3f..ebf4915 100644
--- a/extensions/DEPS
+++ b/extensions/DEPS
@@ -3,7 +3,6 @@ include_rules = [
   "+components/browsing_data",
   "+components/crx_file",
   "+components/guest_view",
-  "+components/prefs",
   "+components/url_matcher",
   "-content",
   "+content/grit/content_resources.h",
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc
index e328ecf..11a3dc7 100644
--- a/extensions/browser/app_window/app_window.cc
+++ b/extensions/browser/app_window/app_window.cc
@@ -57,7 +57,7 @@
 #include "ui/gfx/screen.h"
 
 #if !defined(OS_MACOSX)
-#include "components/prefs/pref_service.h"
+#include "base/prefs/pref_service.h"
 #include "extensions/browser/pref_names.h"
 #endif
 
diff --git a/extensions/browser/app_window/app_window_geometry_cache_unittest.cc b/extensions/browser/app_window/app_window_geometry_cache_unittest.cc
index 491f614..edf1467 100644
--- a/extensions/browser/app_window/app_window_geometry_cache_unittest.cc
+++ b/extensions/browser/app_window/app_window_geometry_cache_unittest.cc
@@ -10,11 +10,11 @@
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/prefs/mock_pref_change_callback.h"
+#include "base/prefs/pref_service_factory.h"
+#include "base/prefs/testing_pref_store.h"
 #include "base/strings/string_number_conversions.h"
 #include "components/pref_registry/pref_registry_syncable.h"
-#include "components/prefs/mock_pref_change_callback.h"
-#include "components/prefs/pref_service_factory.h"
-#include "components/prefs/testing_pref_store.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
@@ -85,7 +85,7 @@ void AppWindowGeometryCacheTest::SetUp() {
 
   // Set up all the dependencies of ExtensionPrefs.
   extension_pref_value_map_.reset(new ExtensionPrefValueMap);
-  PrefServiceFactory factory;
+  base::PrefServiceFactory factory;
   factory.set_user_prefs(new TestingPrefStore);
   factory.set_extension_prefs(new TestingPrefStore);
   user_prefs::PrefRegistrySyncable* pref_registry =
diff --git a/extensions/browser/extension_pref_store.h b/extensions/browser/extension_pref_store.h
index 3585c33..f8acc7a 100644
--- a/extensions/browser/extension_pref_store.h
+++ b/extensions/browser/extension_pref_store.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/macros.h"
-#include "components/prefs/value_map_pref_store.h"
+#include "base/prefs/value_map_pref_store.h"
 #include "extensions/browser/extension_pref_value_map.h"
 
 // A (non-persistent) PrefStore implementation that holds effective preferences
diff --git a/extensions/browser/extension_pref_value_map.cc b/extensions/browser/extension_pref_value_map.cc
index bb1fde5..7d238aa 100644
--- a/extensions/browser/extension_pref_value_map.cc
+++ b/extensions/browser/extension_pref_value_map.cc
@@ -4,8 +4,8 @@
 
 #include "extensions/browser/extension_pref_value_map.h"
 
+#include "base/prefs/pref_value_map.h"
 #include "base/values.h"
-#include "components/prefs/pref_value_map.h"
 
 using extensions::ExtensionPrefsScope;
 
diff --git a/extensions/browser/extension_pref_value_map_unittest.cc b/extensions/browser/extension_pref_value_map_unittest.cc
index 984448b..8a546125 100644
--- a/extensions/browser/extension_pref_value_map_unittest.cc
+++ b/extensions/browser/extension_pref_value_map_unittest.cc
@@ -7,8 +7,8 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/prefs/pref_store_observer_mock.h"
 #include "base/values.h"
-#include "components/prefs/pref_store_observer_mock.h"
 #include "extensions/browser/extension_pref_value_map.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/extensions/browser/extension_prefs.cc b/extensions/browser/extension_prefs.cc
index 37f9842..30eb1dc 100644
--- a/extensions/browser/extension_prefs.cc
+++ b/extensions/browser/extension_prefs.cc
@@ -12,13 +12,13 @@
 
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "components/crx_file/id_util.h"
 #include "components/pref_registry/pref_registry_syncable.h"
-#include "components/prefs/pref_service.h"
 #include "extensions/browser/app_sorting.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_pref_store.h"
diff --git a/extensions/browser/extension_prefs.h b/extensions/browser/extension_prefs.h
index 80b5e37..b20afc4 100644
--- a/extensions/browser/extension_prefs.h
+++ b/extensions/browser/extension_prefs.h
@@ -13,10 +13,10 @@
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
+#include "base/prefs/scoped_user_pref_update.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "components/keyed_service/core/keyed_service.h"
-#include "components/prefs/scoped_user_pref_update.h"
 #include "extensions/browser/blacklist_state.h"
 #include "extensions/browser/extension_scoped_prefs.h"
 #include "extensions/browser/install_flag.h"
diff --git a/extensions/browser/extension_prefs_factory.cc b/extensions/browser/extension_prefs_factory.cc
index 888d9bd..e110bad 100644
--- a/extensions/browser/extension_prefs_factory.cc
+++ b/extensions/browser/extension_prefs_factory.cc
@@ -7,8 +7,8 @@
 #include <utility>
 
 #include "base/command_line.h"
+#include "base/prefs/pref_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
-#include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_context.h"
 #include "extensions/browser/extension_pref_value_map.h"
 #include "extensions/browser/extension_pref_value_map_factory.h"
diff --git a/extensions/browser/lazy_background_task_queue_unittest.cc b/extensions/browser/lazy_background_task_queue_unittest.cc
index a2b82eb..a54e313 100644
--- a/extensions/browser/lazy_background_task_queue_unittest.cc
+++ b/extensions/browser/lazy_background_task_queue_unittest.cc
@@ -7,9 +7,9 @@
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/prefs/testing_pref_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/pref_registry/testing_pref_service_syncable.h"
-#include "components/prefs/testing_pref_service.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_browser_context.h"
diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc
index df6dc98..55aee81 100644
--- a/extensions/shell/browser/shell_browser_main_parts.cc
+++ b/extensions/shell/browser/shell_browser_main_parts.cc
@@ -7,11 +7,11 @@
 #include <string>
 
 #include "base/command_line.h"
+#include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "components/devtools_http_handler/devtools_http_handler.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
-#include "components/prefs/pref_service.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "components/update_client/update_query_params.h"
 #include "content/public/browser/child_process_security_policy.h"
diff --git a/extensions/shell/browser/shell_prefs.cc b/extensions/shell/browser/shell_prefs.cc
index 82185cfc..fdbc656 100644
--- a/extensions/shell/browser/shell_prefs.cc
+++ b/extensions/shell/browser/shell_prefs.cc
@@ -4,13 +4,13 @@
 
 #include "extensions/shell/browser/shell_prefs.h"
 
+#include "base/prefs/json_pref_store.h"
+#include "base/prefs/pref_filter.h"
+#include "base/prefs/pref_registry_simple.h"
+#include "base/prefs/pref_service.h"
+#include "base/prefs/pref_service_factory.h"
 #include "build/build_config.h"
 #include "components/pref_registry/pref_registry_syncable.h"
-#include "components/prefs/json_pref_store.h"
-#include "components/prefs/pref_filter.h"
-#include "components/prefs/pref_registry_simple.h"
-#include "components/prefs/pref_service.h"
-#include "components/prefs/pref_service_factory.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
@@ -53,7 +53,7 @@ scoped_ptr<PrefService> CreateLocalState(const FilePath& data_dir) {
   scoped_refptr<JsonPrefStore> pref_store = CreateAndLoadPrefStore(filepath);
 
   // Local state is considered "user prefs" from the factory's perspective.
-  PrefServiceFactory factory;
+  base::PrefServiceFactory factory;
   factory.set_user_prefs(pref_store);
 
   // Local state preferences are not syncable.
@@ -68,7 +68,7 @@ scoped_ptr<PrefService> CreateUserPrefService(
   FilePath filepath = browser_context->GetPath().AppendASCII("user_prefs.json");
   scoped_refptr<JsonPrefStore> pref_store = CreateAndLoadPrefStore(filepath);
 
-  PrefServiceFactory factory;
+  base::PrefServiceFactory factory;
   factory.set_user_prefs(pref_store);
 
   // TODO(jamescook): If we want to support prefs that are set by extensions
diff --git a/extensions/shell/browser/shell_prefs_unittest.cc b/extensions/shell/browser/shell_prefs_unittest.cc
index 3f91f17..740c0ef 100644
--- a/extensions/shell/browser/shell_prefs_unittest.cc
+++ b/extensions/shell/browser/shell_prefs_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "base/macros.h"
 #include "base/path_service.h"
+#include "base/prefs/pref_service.h"
 #include "build/build_config.h"
-#include "components/prefs/pref_service.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"