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

chromecast/browser/pref_service_helper.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 "chromecast/browser/pref_service_helper.h"
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
+#include "base/prefs/json_pref_store.h"
+#include "base/prefs/pref_registry_simple.h"
+#include "base/prefs/pref_service_factory.h"
+#include "base/prefs/pref_store.h"
 #include "chromecast/base/cast_paths.h"
 #include "chromecast/base/pref_names.h"
-#include "components/prefs/json_pref_store.h"
-#include "components/prefs/pref_registry_simple.h"
-#include "components/prefs/pref_service_factory.h"
-#include "components/prefs/pref_store.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromecast {
 namespace shell {
 
 namespace {
 
 void UserPrefsLoadError(PersistentPrefStore::PrefReadError* error_val,
                         PersistentPrefStore::PrefReadError error) {
   DCHECK(error_val);
@@ skipping 20 matching lines @@
   //  1) Any crashes or UMA logs are recorded prior to setup completing
   //     successfully (even though we can't send them yet).  Unless the user
   //     ends up actually opting out, we don't want to lose this data once
   //     we get network connectivity and are able to send it.  If the user
   //     opts out, nothing further will be sent (honoring the user's setting).
   //  2) Dogfood users (see dogfood agreement).
   registry->RegisterBooleanPref(prefs::kOptInStats, true);
 
   RegisterPlatformPrefs(registry);
 
-  PrefServiceFactory prefServiceFactory;
+  base::PrefServiceFactory prefServiceFactory;
   scoped_refptr<base::SequencedTaskRunner> task_runner =
       JsonPrefStore::GetTaskRunnerForFile(
           config_path,
           content::BrowserThread::GetBlockingPool());
   prefServiceFactory.SetUserPrefsFile(config_path, task_runner.get());
   prefServiceFactory.set_async(false);
 
   PersistentPrefStore::PrefReadError prefs_read_error =
       PersistentPrefStore::PREF_READ_ERROR_NONE;
   prefServiceFactory.set_read_error_callback(
       base::Bind(&UserPrefsLoadError, &prefs_read_error));
 
   scoped_ptr<PrefService> pref_service(prefServiceFactory.Create(registry));
   if (prefs_read_error != PersistentPrefStore::PREF_READ_ERROR_NONE) {
     LOG(ERROR) << "Cannot initialize chromecast config: "
                << config_path.value()
                << ", pref_error=" << prefs_read_error;
   }
 
   OnPrefsLoaded(pref_service.get());
   return pref_service;
 }
 
 }  // namespace shell
 }  // namespace chromecast