Componentize invalidator storage + preferences

components/invalidation/invalidator_storage.cc

 // Copyright (c) 2012 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 "chrome/browser/invalidation/invalidator_storage.h"
+#include "components/invalidation/invalidator_storage.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner.h"
 #include "base/values.h"
-#include "chrome/common/pref_names.h"
+#include "components/invalidation/invalidation_prefs.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 
 namespace {
 
 const char kInvalidatorMaxInvalidationVersions[] =
     "invalidator.max_invalidation_versions";
 
 
 bool ValueToUnackedInvalidationStorageMap(
     const base::ListValue& value,
@@ skipping 99 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