Revert of Delete base/prefs and update callers to use components.

components/keyed_service/core/keyed_service_base_factory.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/keyed_service/core/keyed_service_base_factory.h"
 
+#include "base/prefs/pref_service.h"
 #include "base/supports_user_data.h"
 #include "base/trace_event/trace_event.h"
 #include "components/keyed_service/core/dependency_manager.h"
 #include "components/pref_registry/pref_registry_syncable.h"
-#include "components/prefs/pref_service.h"
 #include "components/user_prefs/user_prefs.h"
 
 void KeyedServiceBaseFactory::RegisterUserPrefsOnContextForTest(
     base::SupportsUserData* context) {
   TRACE_EVENT0("browser,startup",
                "KeyedServiceBaseFactory::RegisterUserPrefsOnContextForTest");
   // Safe timing for pref registration is hard. Previously, we made
   // context responsible for all pref registration on every service
   // that used contexts. Now we don't and there are timing issues.
   //
@@ skipping 90 matching lines @@
 bool KeyedServiceBaseFactory::ArePreferencesSetOn(
     base::SupportsUserData* context) const {
   return registered_preferences_.find(context) != registered_preferences_.end();
 }
 
 void KeyedServiceBaseFactory::MarkPreferencesSetOn(
     base::SupportsUserData* context) {
   DCHECK(!ArePreferencesSetOn(context));
   registered_preferences_.insert(context);
 }