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

ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc

 // Copyright 2015 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 "ios/chrome/browser/prefs/ios_chrome_pref_service_factory.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
-#include "components/prefs/json_pref_store.h"
-#include "components/prefs/persistent_pref_store.h"
-#include "components/prefs/pref_filter.h"
-#include "components/prefs/pref_service.h"
+#include "base/prefs/json_pref_store.h"
+#include "base/prefs/persistent_pref_store.h"
+#include "base/prefs/pref_filter.h"
+#include "base/prefs/pref_service.h"
 #include "components/proxy_config/proxy_config_pref_names.h"
 #include "components/search_engines/default_search_pref_migration.h"
 #include "components/syncable_prefs/pref_service_syncable.h"
 #include "components/syncable_prefs/pref_service_syncable_factory.h"
 #include "ios/chrome/browser/application_context.h"
 #include "ios/chrome/browser/prefs/ios_chrome_pref_model_associator_client.h"
 
 namespace {
 
 const char kPreferencesFilename[] = "Preferences";
@@ skipping 51 matching lines @@
     syncable_prefs::PrefServiceSyncable* pref_service) {
   // List of keys that cannot be changed in the user prefs file by the incognito
   // browser state. All preferences that store information about the browsing
   // history or behaviour of the user should have this property.
   std::vector<const char*> overlay_pref_names;
   overlay_pref_names.push_back(proxy_config::prefs::kProxy);
   return make_scoped_ptr(pref_service->CreateIncognitoPrefService(
       nullptr,  // incognito_extension_pref_store
       overlay_pref_names));
 }