Componentize invalidator storage + preferences

Moves the preferences related to the core parts of the invalidator into
components/invalidaton/invalidation_prefs.{cc,h}.

Moves the InvalidatorStorage into the component.  Its only dependency on
chrome/ was the preference definitions.

TBR=pam
BUG=336571

Review URL: https://codereview.chromium.org/288353003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271145 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 53 insertions, 27 deletions

diff --git a/chrome/browser/invalidation/invalidation_service_factory.cc b/chrome/browser/invalidation/invalidation_service_factory.cc
index bc6befc..a780143 100644
--- a/chrome/browser/invalidation/invalidation_service_factory.cc
+++ b/chrome/browser/invalidation/invalidation_service_factory.cc
@@ -9,7 +9,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/invalidation/fake_invalidation_service.h"
 #include "chrome/browser/invalidation/invalidation_service_android.h"
-#include "chrome/browser/invalidation/invalidator_storage.h"
 #include "chrome/browser/invalidation/ticl_invalidation_service.h"
 #include "chrome/browser/invalidation/ticl_profile_settings_provider.h"
 #include "chrome/browser/profiles/profile.h"
@@ -21,6 +20,7 @@
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/invalidation/invalidation_service.h"
+#include "components/invalidation/invalidator_storage.h"
 #include "components/invalidation/ticl_settings_provider.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/pref_registry/pref_registry_syncable.h"
diff --git a/chrome/browser/invalidation/invalidator_storage_unittest.cc b/chrome/browser/invalidation/invalidator_storage_unittest.cc
index 841bead..aeb0a02 100644
--- a/chrome/browser/invalidation/invalidator_storage_unittest.cc
+++ b/chrome/browser/invalidation/invalidator_storage_unittest.cc
@@ -2,7 +2,7 @@
 // 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/prefs/pref_service.h"
 #include "base/strings/string_util.h"
diff --git a/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc b/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc
index 0445bbe..d6516c1 100644
--- a/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc
+++ b/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc
@@ -13,14 +13,13 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/invalidation/invalidator_storage.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/sync/glue/device_info.h"
 #include "chrome/browser/sync/glue/synced_device_tracker.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
-#include "components/pref_registry/pref_registry_syncable.h"
+#include "components/invalidation/invalidator_storage.h"
 #include "components/sync_driver/sync_frontend.h"
 #include "components/sync_driver/sync_prefs.h"
 #include "content/public/browser/notification_service.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 30d430f..12d734c 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -916,8 +916,6 @@
         'browser/invalidation/invalidation_service_android.h',
         'browser/invalidation/invalidation_service_factory.cc',
         'browser/invalidation/invalidation_service_factory.h',
-        'browser/invalidation/invalidator_storage.cc',
-        'browser/invalidation/invalidator_storage.h',
         'browser/invalidation/ticl_invalidation_service.cc',
         'browser/invalidation/ticl_invalidation_service.h',
         'browser/invalidation/ticl_profile_settings_provider.cc',
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 419a76f..a01fca1 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -1792,17 +1792,6 @@ const char kDevToolsPortForwardingConfig[] = "devtools.port_forwarding_config";
 const char kDevToolsRemoteEnabled[] = "devtools.remote_enabled";
 #endif
 
-// An ID to uniquely identify this client to the invalidator service.
-const char kInvalidatorClientId[] = "invalidator.client_id";
-
-// Opaque state from the invalidation subsystem that is persisted via prefs.
-// The value is base 64 encoded.
-const char kInvalidatorInvalidationState[] = "invalidator.invalidation_state";
-
-// List of received invalidations that have not been acted on by any clients
-// yet.  Used to keep invalidation clients in sync in case of a restart.
-const char kInvalidatorSavedInvalidations[] = "invalidator.saved_invalidations";
-
 // Boolean indicating that TiclInvalidationService should use GCM channel.
 // False or lack of settings means XMPPPushClient channel.
 const char kInvalidationServiceUseGCMChannel[] =
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 4f10be7..d85aa21 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -592,9 +592,6 @@ extern const char kDevToolsRemoteEnabled[];
 
 extern const char kGoogleServicesPasswordHash[];
 
-extern const char kInvalidatorClientId[];
-extern const char kInvalidatorInvalidationState[];
-extern const char kInvalidatorSavedInvalidations[];
 extern const char kInvalidationServiceUseGCMChannel[];
 
 extern const char kSignInPromoStartupCount[];
diff --git a/components/invalidation.gypi b/components/invalidation.gypi
index ada4c4c..e6fae99 100644
--- a/components/invalidation.gypi
+++ b/components/invalidation.gypi
@@ -13,6 +13,7 @@
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         '../jingle/jingle.gyp:notifier',
         'keyed_service_core',
+        'pref_registry',
       ],
       'include_dirs': [
         '..',
@@ -21,11 +22,15 @@
         'invalidation/invalidation_logger.cc',
         'invalidation/invalidation_logger.h',
         'invalidation/invalidation_logger_observer.h',
+        'invalidation/invalidation_prefs.cc',
+        'invalidation/invalidation_prefs.h',
         'invalidation/invalidation_service.h',
         'invalidation/invalidation_service_util.cc',
         'invalidation/invalidation_service_util.h',
         'invalidation/invalidation_switches.cc',
         'invalidation/invalidation_switches.h',
+        'invalidation/invalidator_storage.cc',
+        'invalidation/invalidator_storage.h',
         'invalidation/ticl_settings_provider.cc',
         'invalidation/ticl_settings_provider.h',
       ],
diff --git a/components/invalidation/DEPS b/components/invalidation/DEPS
index fd15cf7..0cefc07 100644
--- a/components/invalidation/DEPS
+++ b/components/invalidation/DEPS
@@ -2,6 +2,7 @@ include_rules = [
   "-content",
 
   "+components/keyed_service",
+  "+components/pref_registry",
 
   "+google/cacheinvalidation",
   "+google_apis/gaia",
diff --git a/components/invalidation/invalidation_prefs.cc b/components/invalidation/invalidation_prefs.cc
new file mode 100644
index 0000000..5f71bd0
--- /dev/null
+++ b/components/invalidation/invalidation_prefs.cc
@@ -0,0 +1,22 @@
+// 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/invalidation_prefs.h"
+
+namespace invalidation {
+namespace prefs {
+
+// An ID to uniquely identify this client to the invalidator service.
+const char kInvalidatorClientId[] = "invalidator.client_id";
+
+// Opaque state from the invalidation subsystem that is persisted via prefs.
+// The value is base 64 encoded.
+const char kInvalidatorInvalidationState[] = "invalidator.invalidation_state";
+
+// List of received invalidations that have not been acted on by any clients
+// yet.  Used to keep invalidation clients in sync in case of a restart.
+const char kInvalidatorSavedInvalidations[] = "invalidator.saved_invalidations";
+
+}  // namespace prefs
+}  // namespace invalidation
diff --git a/components/invalidation/invalidation_prefs.h b/components/invalidation/invalidation_prefs.h
new file mode 100644
index 0000000..2fdc5f2
--- /dev/null
+++ b/components/invalidation/invalidation_prefs.h
@@ -0,0 +1,15 @@
+// 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.
+
+namespace invalidation {
+namespace prefs {
+
+extern const char kInvalidatorClientId[];
+
+extern const char kInvalidatorInvalidationState[];
+
+extern const char kInvalidatorSavedInvalidations[];
+
+}  // namespace prefs
+}  // namespace invalidation
diff --git a/chrome/browser/invalidation/invalidator_storage.cc b/components/invalidation/invalidator_storage.cc
index 0f73a754f..2f59efa 100644
--- a/chrome/browser/invalidation/invalidator_storage.cc
+++ b/components/invalidation/invalidator_storage.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 "chrome/browser/invalidation/invalidator_storage.h"
+#include "components/invalidation/invalidator_storage.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ -14,7 +14,7 @@
 #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 {
diff --git a/chrome/browser/invalidation/invalidator_storage.h b/components/invalidation/invalidator_storage.h
index 37ef025..0101137 100644
--- a/chrome/browser/invalidation/invalidator_storage.h
+++ b/components/invalidation/invalidator_storage.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 //
@@ -6,8 +6,8 @@
 // to use PrefService as persistence for invalidation state. It is not thread
 // safe, and lives on the UI thread.
 
-#ifndef CHROME_BROWSER_INVALIDATION_INVALIDATOR_STORAGE_H_
-#define CHROME_BROWSER_INVALIDATION_INVALIDATOR_STORAGE_H_
+#ifndef COMPONENTS_INVALIDATION_INVALIDATOR_STORAGE_H_
+#define COMPONENTS_INVALIDATION_INVALIDATOR_STORAGE_H_
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
@@ -76,4 +76,4 @@ class InvalidatorStorage : public syncer::InvalidationStateTracker {
 
 }  // namespace invalidation
 
-#endif  // CHROME_BROWSER_INVALIDATION_INVALIDATOR_STORAGE_H_
+#endif  // COMPONENTS_INVALIDATION_INVALIDATOR_STORAGE_H_