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}

11 files changed, 11 insertions, 12 deletions

diff --git a/components/drive/DEPS b/components/drive/DEPS
index c23c40e..48aeee1 100644
--- a/components/drive/DEPS
+++ b/components/drive/DEPS
@@ -1,7 +1,6 @@
 include_rules = [
   "+components/invalidation",
   "+components/keyed_service",
-  "+components/prefs",
   "+google_apis",
   "+google/cacheinvalidation/types.pb.h",
   "+net",
diff --git a/components/drive/change_list_loader_unittest.cc b/components/drive/change_list_loader_unittest.cc
index 4db2c9b..cef19aef 100644
--- a/components/drive/change_list_loader_unittest.cc
+++ b/components/drive/change_list_loader_unittest.cc
@@ -10,6 +10,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ -23,7 +24,6 @@
 #include "components/drive/resource_metadata.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "components/drive/service/test_util.h"
-#include "components/prefs/testing_pref_service.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/test_util.h"
diff --git a/components/drive/directory_loader_unittest.cc b/components/drive/directory_loader_unittest.cc
index f47691d..810a3db 100644
--- a/components/drive/directory_loader_unittest.cc
+++ b/components/drive/directory_loader_unittest.cc
@@ -8,6 +8,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ -21,7 +22,6 @@
 #include "components/drive/resource_metadata.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "components/drive/service/test_util.h"
-#include "components/prefs/testing_pref_service.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/test_util.h"
diff --git a/components/drive/drive_test_util.cc b/components/drive/drive_test_util.cc
index d80f4d9..48bece2 100644
--- a/components/drive/drive_test_util.cc
+++ b/components/drive/drive_test_util.cc
@@ -4,10 +4,10 @@
 
 #include "components/drive/drive_test_util.h"
 
+#include "base/prefs/pref_registry_simple.h"
+#include "base/prefs/testing_pref_service.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_pref_names.h"
-#include "components/prefs/pref_registry_simple.h"
-#include "components/prefs/testing_pref_service.h"
 
 namespace drive {
 namespace test_util {
diff --git a/components/drive/file_system.cc b/components/drive/file_system.cc
index dcb00a6..c42da59 100644
--- a/components/drive/file_system.cc
+++ b/components/drive/file_system.cc
@@ -9,6 +9,7 @@
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
+#include "base/prefs/pref_service.h"
 #include "components/drive/change_list_loader.h"
 #include "components/drive/directory_loader.h"
 #include "components/drive/drive.pb.h"
@@ -34,7 +35,6 @@
 #include "components/drive/resource_entry_conversion.h"
 #include "components/drive/search_metadata.h"
 #include "components/drive/sync_client.h"
-#include "components/prefs/pref_service.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 namespace drive {
diff --git a/components/drive/file_system/operation_test_base.cc b/components/drive/file_system/operation_test_base.cc
index 0aad574..603aed4 100644
--- a/components/drive/file_system/operation_test_base.cc
+++ b/components/drive/file_system/operation_test_base.cc
@@ -4,6 +4,7 @@
 
 #include "components/drive/file_system/operation_test_base.h"
 
+#include "base/prefs/testing_pref_service.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/drive/change_list_loader.h"
 #include "components/drive/event_logger.h"
@@ -15,7 +16,6 @@
 #include "components/drive/resource_metadata.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "components/drive/service/test_util.h"
-#include "components/prefs/testing_pref_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/test_util.h"
diff --git a/components/drive/file_system_core_util.cc b/components/drive/file_system_core_util.cc
index 51e3472..c7b9bb1 100644
--- a/components/drive/file_system_core_util.cc
+++ b/components/drive/file_system_core_util.cc
@@ -18,6 +18,7 @@
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ -26,7 +27,6 @@
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_pref_names.h"
 #include "components/drive/job_list.h"
-#include "components/prefs/pref_service.h"
 
 namespace drive {
 namespace util {
diff --git a/components/drive/file_system_unittest.cc b/components/drive/file_system_unittest.cc
index 271dba1..354c3e4 100644
--- a/components/drive/file_system_unittest.cc
+++ b/components/drive/file_system_unittest.cc
@@ -16,6 +16,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ -32,7 +33,6 @@
 #include "components/drive/service/fake_drive_service.h"
 #include "components/drive/service/test_util.h"
 #include "components/drive/sync_client.h"
-#include "components/prefs/testing_pref_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/drive/drive_api_parser.h"
diff --git a/components/drive/job_scheduler.cc b/components/drive/job_scheduler.cc
index a422e1d..036d3c8 100644
--- a/components/drive/job_scheduler.cc
+++ b/components/drive/job_scheduler.cc
@@ -10,13 +10,13 @@
 
 #include "base/files/file_util.h"
 #include "base/metrics/histogram.h"
+#include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "components/drive/drive_pref_names.h"
 #include "components/drive/event_logger.h"
-#include "components/prefs/pref_service.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 namespace drive {
diff --git a/components/drive/job_scheduler_unittest.cc b/components/drive/job_scheduler_unittest.cc
index 4b390fe..a6e4f13 100644
--- a/components/drive/job_scheduler_unittest.cc
+++ b/components/drive/job_scheduler_unittest.cc
@@ -12,6 +12,7 @@
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
@@ -22,7 +23,6 @@
 #include "components/drive/event_logger.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "components/drive/service/test_util.h"
-#include "components/prefs/testing_pref_service.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/test_util.h"
diff --git a/components/drive/sync_client_unittest.cc b/components/drive/sync_client_unittest.cc
index 6770264..250b85d 100644
--- a/components/drive/sync_client_unittest.cc
+++ b/components/drive/sync_client_unittest.cc
@@ -8,6 +8,7 @@
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/test/test_timeouts.h"
@@ -27,7 +28,6 @@
 #include "components/drive/resource_entry_conversion.h"
 #include "components/drive/resource_metadata.h"
 #include "components/drive/service/fake_drive_service.h"
-#include "components/prefs/testing_pref_service.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/test_util.h"