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

components/invalidation/impl/invalidator_storage.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/invalidation/impl/invalidator_storage.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/prefs/pref_registry_simple.h"
+#include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "components/invalidation/impl/invalidation_prefs.h"
 #include "components/invalidation/impl/unacked_invalidation_set.h"
 #include "components/pref_registry/pref_registry_syncable.h"
-#include "components/prefs/pref_registry_simple.h"
-#include "components/prefs/pref_service.h"
 #include "google/cacheinvalidation/types.pb.h"
 
 namespace {
 
 const char kInvalidatorMaxInvalidationVersions[] =
     "invalidator.max_invalidation_versions";
 
 bool ValueToUnackedInvalidationStorageMap(
     const base::ListValue& value,
     syncer::UnackedInvalidationsMap* map) {
@@ skipping 100 matching lines @@
 }
 
 void InvalidatorStorage::Clear() {
   DCHECK(thread_checker_.CalledOnValidThread());
   pref_service_->ClearPref(prefs::kInvalidatorSavedInvalidations);
   pref_service_->ClearPref(prefs::kInvalidatorClientId);
   pref_service_->ClearPref(prefs::kInvalidatorInvalidationState);
 }
 
 }  // namespace invalidation