Introduce a layering in the invalidation component as public and impl.

The invalidation component has dependencies due to specific
implementations of the inv_client, inv_service etc.
Consumers of invalidations do not need to depend on these.

This change exports the InvalidationHandler interface in a separate target
'invalidation_public' which only depends on //google/cacheinvalidation

Thus the signin component can implement to InvalidationHandler to refresh
account information without introducing a cyclic dependency.

The crux of the change is:

Move {components/invalidation/ => components/invalidation/public}:
-ack_handle.cc
-ack_handle.h
-ack_handler.cc
-ack_handler.h
-invalidation.cc
-invalidation.h
-invalidation_export.h
-invalidation_handler.cc
-invalidation_handler.h
-invalidation_service.h
-invalidation_util.cc
-invalidation_util.h
-invalidator_state.cc
-invalidator_state.h
-object_id_invalidation_map.cc
-object_id_invalidation_map.h
-single_object_invalidation_set.cc
-single_object_invalidation_set.h

Move {components/invalidation/ => components/invalidation/impl}:
other files

Thus the dependency chain is:
//chrome/browser/ -> //components/invalidation/impl -> components/invalidation/public

Now invalidation consumers can directly depend on //components/invalidation/public
which has only //google/cacheinvalidation has a dependency.

BUG=503131

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

Cr-Commit-Position: refs/heads/master@{#336413}

55 files changed, 121 insertions, 121 deletions

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 7760de2..9c406f4 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -124,7 +124,7 @@ android_library("chrome_java") {
     "//components/dom_distiller/android:dom_distiller_content_java",
     "//components/dom_distiller/android:dom_distiller_core_java",
     "//components/gcm_driver/android:gcm_driver_java",
-    "//components/invalidation:java",
+    "//components/invalidation/impl:java",
     "//components/navigation_interception/android:navigation_interception_java",
     "//components/service_tab_launcher:service_tab_launcher_java",
     "//components/precache/android:precache_java",
@@ -451,8 +451,8 @@ android_library("chrome_javatests") {
     "//chrome/test/android:chrome_java_test_support",
     "//components/bookmarks/common/android:bookmarks_java",
     "//components/dom_distiller/android:dom_distiller_core_java",
-    "//components/invalidation:java",
-    "//components/invalidation:javatests",
+    "//components/invalidation/impl:java",
+    "//components/invalidation/impl:javatests",
     "//components/navigation_interception/android:navigation_interception_java",
     "//components/precache/android:precache_java",
     "//components/precache/android:precache_javatests",
@@ -538,7 +538,7 @@ if (false) {
       "//base:base_java",
       "//base:base_java_test_support",
       "//chrome/test/android:chrome_java_test_support",
-      "//components/invalidation:java",
+      "//components/invalidation/impl:java",
       "//content/public/android:content_java",
       "//content/public/test/android:content_java_test_support",
       "//sync/android:sync_java",
@@ -617,7 +617,7 @@ android_library("chrome_shared_test_java") {
     "//chrome/test/android:chrome_java_test_support",
     "//components/bookmarks/common/android:bookmarks_java",
     "//components/dom_distiller/android:dom_distiller_core_java",
-    "//components/invalidation:java",
+    "//components/invalidation/impl:java",
     "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 2cccfbd..963d083 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -114,7 +114,7 @@ source_set("browser") {
     "//components/history/core/browser",
     "//components/history/core/common",
     "//components/infobars/core",
-    "//components/invalidation",
+    "//components/invalidation/impl",
     "//components/metrics:gpu",
     "//components/metrics:net",
     "//components/metrics:profiler",
@@ -1029,8 +1029,8 @@ source_set("test_support") {
     "//chrome/browser",
     "//chrome/common",
     "//chrome/common/safe_browsing:proto",
-    "//components/invalidation",
-    "//components/invalidation:test_support",
+    "//components/invalidation/impl",
+    "//components/invalidation/impl:test_support",
     "//components/password_manager/core/browser:test_support",
     "//components/search_engines:test_support",
     "//content/test:test_support",
diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc
index a3edbc3..9aee69d 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -130,7 +130,7 @@
 #include "components/bookmarks/common/android/component_jni_registrar.h"
 #include "components/dom_distiller/android/component_jni_registrar.h"
 #include "components/gcm_driver/android/component_jni_registrar.h"
-#include "components/invalidation/android/component_jni_registrar.h"
+#include "components/invalidation/impl/android/component_jni_registrar.h"
 #include "components/navigation_interception/component_jni_registrar.h"
 #include "components/service_tab_launcher/component_jni_registrar.h"
 #include "components/variations/android/component_jni_registrar.h"
diff --git a/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator_unittest.cc b/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator_unittest.cc
index f277324..23be632 100644
--- a/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator_unittest.cc
+++ b/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator_unittest.cc
@@ -13,8 +13,8 @@
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/invalidation/fake_invalidation_service.h"
 #include "chrome/browser/policy/cloud/cloud_policy_invalidator.h"
-#include "components/invalidation/invalidation.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/public/invalidation.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
diff --git a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
index 1a23a87..1c81969 100644
--- a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
+++ b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
@@ -19,14 +19,14 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_content_client.h"
-#include "components/invalidation/invalidation_handler.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/invalidation_state_tracker.h"
-#include "components/invalidation/invalidator_state.h"
-#include "components/invalidation/invalidator_storage.h"
-#include "components/invalidation/profile_invalidation_provider.h"
-#include "components/invalidation/ticl_invalidation_service.h"
-#include "components/invalidation/ticl_settings_provider.h"
+#include "components/invalidation/impl/invalidation_state_tracker.h"
+#include "components/invalidation/impl/invalidator_storage.h"
+#include "components/invalidation/impl/profile_invalidation_provider.h"
+#include "components/invalidation/impl/ticl_invalidation_service.h"
+#include "components/invalidation/impl/ticl_settings_provider.h"
+#include "components/invalidation/public/invalidation_handler.h"
+#include "components/invalidation/public/invalidation_service.h"
+#include "components/invalidation/public/invalidator_state.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/user_manager/user.h"
 #include "content/public/browser/notification_details.h"
diff --git a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc
index 5918728e..143a37e1 100644
--- a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc
+++ b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc
@@ -21,11 +21,11 @@
 #include "chrome/test/base/testing_profile_manager.h"
 #include "chromeos/cryptohome/system_salt_getter.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "components/invalidation/fake_invalidation_handler.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/invalidator_state.h"
-#include "components/invalidation/profile_invalidation_provider.h"
-#include "components/invalidation/ticl_invalidation_service.h"
+#include "components/invalidation/impl/fake_invalidation_handler.h"
+#include "components/invalidation/impl/profile_invalidation_provider.h"
+#include "components/invalidation/impl/ticl_invalidation_service.h"
+#include "components/invalidation/public/invalidation_service.h"
+#include "components/invalidation/public/invalidator_state.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "content/public/browser/browser_context.h"
diff --git a/chrome/browser/chromeos/policy/ticl_device_settings_provider.h b/chrome/browser/chromeos/policy/ticl_device_settings_provider.h
index e9eaa520..58d85ba3 100644
--- a/chrome/browser/chromeos/policy/ticl_device_settings_provider.h
+++ b/chrome/browser/chromeos/policy/ticl_device_settings_provider.h
@@ -7,7 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "components/invalidation/ticl_settings_provider.h"
+#include "components/invalidation/impl/ticl_settings_provider.h"
 
 namespace policy {
 
diff --git a/chrome/browser/drive/drive_notification_manager.cc b/chrome/browser/drive/drive_notification_manager.cc
index b25d2be..fb1e3a6 100644
--- a/chrome/browser/drive/drive_notification_manager.cc
+++ b/chrome/browser/drive/drive_notification_manager.cc
@@ -6,8 +6,8 @@
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/drive/drive_notification_observer.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/public/invalidation_service.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "google/cacheinvalidation/types.pb.h"
 
 namespace drive {
diff --git a/chrome/browser/drive/drive_notification_manager.h b/chrome/browser/drive/drive_notification_manager.h
index bd3f6f5..18ae5d0 100644
--- a/chrome/browser/drive/drive_notification_manager.h
+++ b/chrome/browser/drive/drive_notification_manager.h
@@ -9,7 +9,7 @@
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/drive/drive_notification_observer.h"
-#include "components/invalidation/invalidation_handler.h"
+#include "components/invalidation/public/invalidation_handler.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 class ProfileSyncService;
diff --git a/chrome/browser/drive/drive_notification_manager_factory.cc b/chrome/browser/drive/drive_notification_manager_factory.cc
index a262b26..51cda01 100644
--- a/chrome/browser/drive/drive_notification_manager_factory.cc
+++ b/chrome/browser/drive/drive_notification_manager_factory.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
-#include "components/invalidation/profile_invalidation_provider.h"
+#include "components/invalidation/impl/profile_invalidation_provider.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
 namespace drive {
diff --git a/chrome/browser/invalidation/fake_invalidation_service.cc b/chrome/browser/invalidation/fake_invalidation_service.cc
index ef3176a..fd6a211 100644
--- a/chrome/browser/invalidation/fake_invalidation_service.cc
+++ b/chrome/browser/invalidation/fake_invalidation_service.cc
@@ -6,8 +6,8 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "components/invalidation/invalidation_service_util.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/impl/invalidation_service_util.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 
 namespace invalidation {
 
diff --git a/chrome/browser/invalidation/fake_invalidation_service.h b/chrome/browser/invalidation/fake_invalidation_service.h
index 39e0fd0..2cd3965 100644
--- a/chrome/browser/invalidation/fake_invalidation_service.h
+++ b/chrome/browser/invalidation/fake_invalidation_service.h
@@ -11,9 +11,9 @@
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/invalidator_registrar.h"
-#include "components/invalidation/mock_ack_handler.h"
+#include "components/invalidation/impl/invalidator_registrar.h"
+#include "components/invalidation/impl/mock_ack_handler.h"
+#include "components/invalidation/public/invalidation_service.h"
 #include "google_apis/gaia/fake_identity_provider.h"
 
 namespace syncer {
diff --git a/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc b/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc
index 887fd40..c058d16 100644
--- a/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc
+++ b/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc
@@ -16,7 +16,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "components/gcm_driver/fake_gcm_driver.h"
 #include "components/gcm_driver/gcm_driver.h"
-#include "components/invalidation/gcm_invalidation_bridge.h"
+#include "components/invalidation/impl/gcm_invalidation_bridge.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/fake_identity_provider.h"
 #include "google_apis/gaia/google_service_auth_error.h"
diff --git a/chrome/browser/invalidation/invalidation_service_factory_android.cc b/chrome/browser/invalidation/invalidation_service_factory_android.cc
index 4f6b55c..821d702 100644
--- a/chrome/browser/invalidation/invalidation_service_factory_android.cc
+++ b/chrome/browser/invalidation/invalidation_service_factory_android.cc
@@ -8,8 +8,8 @@
 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
-#include "components/invalidation/invalidation_service_android.h"
-#include "components/invalidation/profile_invalidation_provider.h"
+#include "components/invalidation/impl/invalidation_service_android.h"
+#include "components/invalidation/impl/profile_invalidation_provider.h"
 #include "jni/InvalidationServiceFactory_jni.h"
 
 using base::android::ScopedJavaLocalRef;
diff --git a/chrome/browser/invalidation/invalidator_storage_unittest.cc b/chrome/browser/invalidation/invalidator_storage_unittest.cc
index 37e95a7..d37588b 100644
--- a/chrome/browser/invalidation/invalidator_storage_unittest.cc
+++ b/chrome/browser/invalidation/invalidator_storage_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/invalidator_storage.h"
+#include "components/invalidation/impl/invalidator_storage.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
-#include "components/invalidation/unacked_invalidation_set_test_util.h"
+#include "components/invalidation/impl/unacked_invalidation_set_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace invalidation {
diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
index 4bc6171..8611af3 100644
--- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
+++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
@@ -17,12 +17,12 @@
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/pref_names.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/invalidation_state_tracker.h"
-#include "components/invalidation/invalidator_storage.h"
-#include "components/invalidation/profile_invalidation_provider.h"
-#include "components/invalidation/ticl_invalidation_service.h"
-#include "components/invalidation/ticl_settings_provider.h"
+#include "components/invalidation/impl/invalidation_state_tracker.h"
+#include "components/invalidation/impl/invalidator_storage.h"
+#include "components/invalidation/impl/profile_invalidation_provider.h"
+#include "components/invalidation/impl/ticl_invalidation_service.h"
+#include "components/invalidation/impl/ticl_settings_provider.h"
+#include "components/invalidation/public/invalidation_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
@@ -31,7 +31,7 @@
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
-#include "components/invalidation/invalidation_service_android.h"
+#include "components/invalidation/impl/invalidation_service_android.h"
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc
index d0cb225..eebdc0f 100644
--- a/chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc
+++ b/chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc
@@ -12,8 +12,8 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/login/user_names.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/profile_invalidation_provider.h"
+#include "components/invalidation/impl/profile_invalidation_provider.h"
+#include "components/invalidation/public/invalidation_service.h"
 #include "components/user_manager/user_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/invalidation/ticl_profile_settings_provider.h b/chrome/browser/invalidation/ticl_profile_settings_provider.h
index 1fb01ab..56f970c 100644
--- a/chrome/browser/invalidation/ticl_profile_settings_provider.h
+++ b/chrome/browser/invalidation/ticl_profile_settings_provider.h
@@ -8,7 +8,7 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/prefs/pref_change_registrar.h"
-#include "components/invalidation/ticl_settings_provider.h"
+#include "components/invalidation/impl/ticl_settings_provider.h"
 
 class Profile;
 
diff --git a/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc b/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc
index 2deed93a..baf1d0f 100644
--- a/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc
+++ b/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc
@@ -12,10 +12,10 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/gcm_driver/gcm_channel_status_syncer.h"
-#include "components/invalidation/fake_invalidation_state_tracker.h"
-#include "components/invalidation/invalidation_state_tracker.h"
-#include "components/invalidation/ticl_invalidation_service.h"
-#include "components/invalidation/ticl_settings_provider.h"
+#include "components/invalidation/impl/fake_invalidation_state_tracker.h"
+#include "components/invalidation/impl/invalidation_state_tracker.h"
+#include "components/invalidation/impl/ticl_invalidation_service.h"
+#include "components/invalidation/impl/ticl_settings_provider.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/fake_identity_provider.h"
 #include "google_apis/gaia/fake_oauth2_token_service.h"
diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
index 8958e7b..946f119 100644
--- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
@@ -23,9 +23,9 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "components/invalidation/invalidation.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/profile_invalidation_provider.h"
+#include "components/invalidation/impl/profile_invalidation_provider.h"
+#include "components/invalidation/public/invalidation.h"
+#include "components/invalidation/public/invalidation_service.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/policy/core/browser/browser_policy_connector.h"
 #include "components/policy/core/common/cloud/cloud_policy_client.h"
diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator.cc
index 02bd109..0947a24 100644
--- a/chrome/browser/policy/cloud/cloud_policy_invalidator.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.cc
@@ -13,8 +13,8 @@
 #include "base/time/clock.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/public/invalidation_service.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "components/policy/core/common/cloud/cloud_policy_client.h"
 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
 #include "components/policy/core/common/cloud/enterprise_metrics.h"
diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.h b/chrome/browser/policy/cloud/cloud_policy_invalidator.h
index fbf9b9a..fa89d12 100644
--- a/chrome/browser/policy/cloud/cloud_policy_invalidator.h
+++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.h
@@ -15,8 +15,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "components/invalidation/invalidation.h"
-#include "components/invalidation/invalidation_handler.h"
+#include "components/invalidation/public/invalidation.h"
+#include "components/invalidation/public/invalidation_handler.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "google/cacheinvalidation/include/types.h"
diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc
index 4af70ba..6ba4978 100644
--- a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc
@@ -20,7 +20,7 @@
 #include "chrome/browser/invalidation/fake_invalidation_service.h"
 #include "chrome/browser/policy/cloud/cloud_policy_invalidator.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator.h"
-#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/public/invalidation_util.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
diff --git a/chrome/browser/policy/cloud/remote_commands_invalidator.cc b/chrome/browser/policy/cloud/remote_commands_invalidator.cc
index 9e094f9..eb0e412 100644
--- a/chrome/browser/policy/cloud/remote_commands_invalidator.cc
+++ b/chrome/browser/policy/cloud/remote_commands_invalidator.cc
@@ -7,12 +7,12 @@
 #include <string>
 
 #include "base/logging.h"
-#include "components/invalidation/invalidation.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/invalidation_util.h"
-#include "components/invalidation/invalidator_state.h"
-#include "components/invalidation/object_id_invalidation_map.h"
-#include "components/invalidation/single_object_invalidation_set.h"
+#include "components/invalidation/public/invalidation.h"
+#include "components/invalidation/public/invalidation_service.h"
+#include "components/invalidation/public/invalidation_util.h"
+#include "components/invalidation/public/invalidator_state.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
+#include "components/invalidation/public/single_object_invalidation_set.h"
 
 namespace policy {
 
diff --git a/chrome/browser/policy/cloud/remote_commands_invalidator.h b/chrome/browser/policy/cloud/remote_commands_invalidator.h
index 07d0194..734bbfc 100644
--- a/chrome/browser/policy/cloud/remote_commands_invalidator.h
+++ b/chrome/browser/policy/cloud/remote_commands_invalidator.h
@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
-#include "components/invalidation/invalidation_handler.h"
+#include "components/invalidation/public/invalidation_handler.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "policy/proto/device_management_backend.pb.h"
 
diff --git a/chrome/browser/policy/cloud/remote_commands_invalidator_unittest.cc b/chrome/browser/policy/cloud/remote_commands_invalidator_unittest.cc
index d33a919..e1da6ef 100644
--- a/chrome/browser/policy/cloud/remote_commands_invalidator_unittest.cc
+++ b/chrome/browser/policy/cloud/remote_commands_invalidator_unittest.cc
@@ -7,11 +7,11 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "chrome/browser/invalidation/fake_invalidation_service.h"
-#include "components/invalidation/invalidation.h"
-#include "components/invalidation/invalidation_util.h"
-#include "components/invalidation/invalidator_registrar.h"
-#include "components/invalidation/invalidator_state.h"
-#include "components/invalidation/mock_ack_handler.h"
+#include "components/invalidation/impl/invalidator_registrar.h"
+#include "components/invalidation/impl/mock_ack_handler.h"
+#include "components/invalidation/public/invalidation.h"
+#include "components/invalidation/public/invalidation_util.h"
+#include "components/invalidation/public/invalidator_state.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc b/chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc
index 02157b3..76953a4 100644
--- a/chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc
+++ b/chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc
@@ -10,7 +10,7 @@
 #include "base/time/default_clock.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
-#include "components/invalidation/profile_invalidation_provider.h"
+#include "components/invalidation/impl/profile_invalidation_provider.h"
 #include "components/policy/core/common/cloud/cloud_policy_manager.h"
 #include "content/public/browser/notification_source.h"
 
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 9e3e8a0..2f32240 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -197,7 +197,7 @@
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chromeos/audio/audio_devices_pref_handler_impl.h"
 #include "chromeos/timezone/timezone_resolver.h"
-#include "components/invalidation/invalidator_storage.h"
+#include "components/invalidation/impl/invalidator_storage.h"
 #else
 #include "chrome/browser/extensions/default_apps.h"
 #endif
diff --git a/chrome/browser/sync/glue/invalidation_adapter.h b/chrome/browser/sync/glue/invalidation_adapter.h
index a57d14c..7f36da1 100644
--- a/chrome/browser/sync/glue/invalidation_adapter.h
+++ b/chrome/browser/sync/glue/invalidation_adapter.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_SYNC_GLUE_INVALIDATION_ADAPTER_H_
 #define CHROME_BROWSER_SYNC_GLUE_INVALIDATION_ADAPTER_H_
 
-#include "components/invalidation/invalidation.h"
+#include "components/invalidation/public/invalidation.h"
 #include "sync/internal_api/public/base/invalidation_interface.h"
 
 namespace browser_sync {
diff --git a/chrome/browser/sync/glue/invalidation_helper.h b/chrome/browser/sync/glue/invalidation_helper.h
index b53709e..33dad63 100644
--- a/chrome/browser/sync/glue/invalidation_helper.h
+++ b/chrome/browser/sync/glue/invalidation_helper.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_SYNC_GLUE_INVALIDATION_HELPER_H_
 #define CHROME_BROWSER_SYNC_GLUE_INVALIDATION_HELPER_H_
 
-#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/public/invalidation_util.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "sync/internal_api/public/base/model_type.h"
 
diff --git a/chrome/browser/sync/glue/sync_backend_host_core.cc b/chrome/browser/sync/glue/sync_backend_host_core.cc
index c365287..bc08fb9 100644
--- a/chrome/browser/sync/glue/sync_backend_host_core.cc
+++ b/chrome/browser/sync/glue/sync_backend_host_core.cc
@@ -12,8 +12,8 @@
 #include "chrome/browser/sync/glue/local_device_info_provider_impl.h"
 #include "chrome/browser/sync/glue/sync_backend_registrar.h"
 #include "chrome/common/chrome_version_info.h"
-#include "components/invalidation/invalidation_util.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/public/invalidation_util.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "sync/internal_api/public/events/protocol_event.h"
 #include "sync/internal_api/public/http_post_provider_factory.h"
 #include "sync/internal_api/public/internal_components_factory.h"
diff --git a/chrome/browser/sync/glue/sync_backend_host_impl.cc b/chrome/browser/sync/glue/sync_backend_host_impl.cc
index 7634bc0..122009c 100644
--- a/chrome/browser/sync/glue/sync_backend_host_impl.cc
+++ b/chrome/browser/sync/glue/sync_backend_host_impl.cc
@@ -16,8 +16,8 @@
 #include "chrome/browser/sync/glue/sync_backend_host_core.h"
 #include "chrome/browser/sync/glue/sync_backend_registrar.h"
 #include "chrome/common/chrome_switches.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/public/invalidation_service.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "components/network_time/network_time_tracker.h"
 #include "components/signin/core/browser/signin_client.h"
 #include "components/sync_driver/sync_frontend.h"
diff --git a/chrome/browser/sync/glue/sync_backend_host_impl.h b/chrome/browser/sync/glue/sync_backend_host_impl.h
index 731d830..b8690d694 100644
--- a/chrome/browser/sync/glue/sync_backend_host_impl.h
+++ b/chrome/browser/sync/glue/sync_backend_host_impl.h
@@ -15,7 +15,7 @@
 #include "base/threading/thread.h"
 #include "chrome/browser/sync/glue/extensions_activity_monitor.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
-#include "components/invalidation/invalidation_handler.h"
+#include "components/invalidation/public/invalidation_handler.h"
 #include "components/sync_driver/backend_data_type_configurer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.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 914eb02..b864cbc 100644
--- a/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc
+++ b/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc
@@ -18,9 +18,9 @@
 #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/invalidation/invalidator_state.h"
-#include "components/invalidation/invalidator_storage.h"
-#include "components/invalidation/profile_invalidation_provider.h"
+#include "components/invalidation/impl/invalidator_storage.h"
+#include "components/invalidation/impl/profile_invalidation_provider.h"
+#include "components/invalidation/public/invalidator_state.h"
 #include "components/sync_driver/device_info.h"
 #include "components/sync_driver/sync_frontend.h"
 #include "components/sync_driver/sync_prefs.h"
diff --git a/chrome/browser/sync/profile_sync_components_factory.h b/chrome/browser/sync/profile_sync_components_factory.h
index 2ee7c16..9fa6ab1 100644
--- a/chrome/browser/sync/profile_sync_components_factory.h
+++ b/chrome/browser/sync/profile_sync_components_factory.h
@@ -9,7 +9,7 @@
 
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
-#include "components/invalidation/invalidation_service.h"
+#include "components/invalidation/public/invalidation_service.h"
 #include "components/sync_driver/data_type_controller.h"
 #include "components/sync_driver/data_type_error_handler.h"
 #include "components/sync_driver/sync_api_component_factory.h"
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index b12a23f..865b120 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -63,8 +63,8 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/profile_invalidation_provider.h"
+#include "components/invalidation/impl/profile_invalidation_provider.h"
+#include "components/invalidation/public/invalidation_service.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/signin/core/browser/about_signin_internals.h"
diff --git a/chrome/browser/sync/profile_sync_service_android.h b/chrome/browser/sync/profile_sync_service_android.h
index 9594311..81e1702 100644
--- a/chrome/browser/sync/profile_sync_service_android.h
+++ b/chrome/browser/sync/profile_sync_service_android.h
@@ -12,7 +12,7 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
-#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/public/invalidation_util.h"
 #include "components/sync_driver/sync_prefs.h"
 #include "components/sync_driver/sync_service_observer.h"
 #include "google/cacheinvalidation/include/types.h"
diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
index a4fa856..e469b5c 100644
--- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
@@ -48,8 +48,8 @@
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/history_types.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/profile_invalidation_provider.h"
+#include "components/invalidation/impl/profile_invalidation_provider.h"
+#include "components/invalidation/public/invalidation_service.h"
 #include "components/keyed_service/core/refcounted_keyed_service.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/signin_manager.h"
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index c9c3491..d4a1079 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -30,8 +30,8 @@
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/profile_invalidation_provider.h"
+#include "components/invalidation/impl/profile_invalidation_provider.h"
+#include "components/invalidation/public/invalidation_service.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_manager.h"
diff --git a/chrome/browser/sync/test/integration/fake_server_invalidation_service.cc b/chrome/browser/sync/test/integration/fake_server_invalidation_service.cc
index ce2b3a5..9b93157 100644
--- a/chrome/browser/sync/test/integration/fake_server_invalidation_service.cc
+++ b/chrome/browser/sync/test/integration/fake_server_invalidation_service.cc
@@ -8,9 +8,9 @@
 
 #include "base/macros.h"
 #include "chrome/browser/sync/glue/invalidation_helper.h"
-#include "components/invalidation/invalidation.h"
-#include "components/invalidation/invalidation_service_util.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/impl/invalidation_service_util.h"
+#include "components/invalidation/public/invalidation.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "sync/internal_api/public/base/model_type.h"
 
 namespace fake_server {
diff --git a/chrome/browser/sync/test/integration/fake_server_invalidation_service.h b/chrome/browser/sync/test/integration/fake_server_invalidation_service.h
index bdc7d1b..2cb01c4 100644
--- a/chrome/browser/sync/test/integration/fake_server_invalidation_service.h
+++ b/chrome/browser/sync/test/integration/fake_server_invalidation_service.h
@@ -10,8 +10,8 @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/invalidator_registrar.h"
+#include "components/invalidation/impl/invalidator_registrar.h"
+#include "components/invalidation/public/invalidation_service.h"
 #include "google_apis/gaia/fake_identity_provider.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/test/fake_server/fake_server.h"
diff --git a/chrome/browser/sync/test/integration/p2p_invalidation_forwarder.cc b/chrome/browser/sync/test/integration/p2p_invalidation_forwarder.cc
index aac1f20..01b68cc 100644
--- a/chrome/browser/sync/test/integration/p2p_invalidation_forwarder.cc
+++ b/chrome/browser/sync/test/integration/p2p_invalidation_forwarder.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/sync/glue/invalidation_helper.h"
 #include "chrome/browser/sync/profile_sync_service.h"
-#include "components/invalidation/p2p_invalidation_service.h"
+#include "components/invalidation/impl/p2p_invalidation_service.h"
 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"
 
 P2PInvalidationForwarder::P2PInvalidationForwarder(
diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
index 25caa5a..e91a689 100644
--- a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
+++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
@@ -25,7 +25,7 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/webui/signin/login_ui_test_utils.h"
 #include "chrome/common/chrome_switches.h"
-#include "components/invalidation/p2p_invalidation_service.h"
+#include "components/invalidation/impl/p2p_invalidation_service.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "components/sync_driver/data_type_controller.h"
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index dfc4a26..ec05a7e 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -54,11 +54,11 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/google/core/browser/google_url_tracker.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/invalidation_switches.h"
-#include "components/invalidation/p2p_invalidation_service.h"
-#include "components/invalidation/p2p_invalidator.h"
-#include "components/invalidation/profile_invalidation_provider.h"
+#include "components/invalidation/impl/invalidation_switches.h"
+#include "components/invalidation/impl/p2p_invalidation_service.h"
+#include "components/invalidation/impl/p2p_invalidator.h"
+#include "components/invalidation/impl/profile_invalidation_provider.h"
+#include "components/invalidation/public/invalidation_service.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/os_crypt/os_crypt.h"
 #include "components/search_engines/template_url_service.h"
diff --git a/chrome/browser/sync/test_profile_sync_service.cc b/chrome/browser/sync/test_profile_sync_service.cc
index a86b264..1233540 100644
--- a/chrome/browser/sync/test_profile_sync_service.cc
+++ b/chrome/browser/sync/test_profile_sync_service.cc
@@ -20,7 +20,7 @@
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
 #include "chrome/browser/sync/test/test_http_bridge_factory.h"
-#include "components/invalidation/profile_invalidation_provider.h"
+#include "components/invalidation/impl/profile_invalidation_provider.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "sync/internal_api/public/test/sync_manager_factory_for_profile_sync_test.h"
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index b85d55b..395db42 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -49,7 +49,7 @@ source_set("ui") {
     "//components/app_modal",
     "//components/auto_login_parser",
     "//components/dom_distiller/webui",
-    "//components/invalidation",
+    "//components/invalidation/impl",
     "//components/onc",
     "//components/password_manager/core/browser",
     "//components/resources",
diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc
index 75fe5a7..48dd4a8 100644
--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -17,7 +17,7 @@
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/simple_alert_infobar_delegate.h"
-#include "components/invalidation/invalidation_switches.h"
+#include "components/invalidation/impl/invalidation_switches.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "components/startup_metric_utils/startup_metric_utils.h"
 #include "components/translate/core/common/translate_switches.h"
diff --git a/chrome/browser/ui/webui/invalidations_message_handler.cc b/chrome/browser/ui/webui/invalidations_message_handler.cc
index 8d5586d..3010ca2 100644
--- a/chrome/browser/ui/webui/invalidations_message_handler.cc
+++ b/chrome/browser/ui/webui/invalidations_message_handler.cc
@@ -7,10 +7,10 @@
 #include "base/bind.h"
 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "components/invalidation/invalidation_handler.h"
-#include "components/invalidation/invalidation_logger.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/profile_invalidation_provider.h"
+#include "components/invalidation/impl/invalidation_logger.h"
+#include "components/invalidation/impl/profile_invalidation_provider.h"
+#include "components/invalidation/public/invalidation_handler.h"
+#include "components/invalidation/public/invalidation_service.h"
 #include "content/public/browser/web_ui.h"
 
 namespace invalidation {
diff --git a/chrome/browser/ui/webui/invalidations_message_handler.h b/chrome/browser/ui/webui/invalidations_message_handler.h
index 2320ba4..e5fe779 100644
--- a/chrome/browser/ui/webui/invalidations_message_handler.h
+++ b/chrome/browser/ui/webui/invalidations_message_handler.h
@@ -9,8 +9,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
-#include "components/invalidation/invalidation_logger_observer.h"
-#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/impl/invalidation_logger_observer.h"
+#include "components/invalidation/public/invalidation_util.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
 class Profile;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index d489874..e9cee16 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3148,7 +3148,7 @@
         '../components/components.gyp:history_core_common',
         '../components/components.gyp:infobars_core',
         '../components/components.gyp:instance_id',
-        '../components/components.gyp:invalidation',
+        '../components/components.gyp:invalidation_impl',
         '../components/components.gyp:metrics',
         '../components/components.gyp:metrics_gpu',
         '../components/components.gyp:metrics_net',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 032e38a..5044d4e 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2747,7 +2747,7 @@
         '../components/components.gyp:device_event_log_component',
         '../components/components.gyp:dom_distiller_core',
         '../components/components.gyp:dom_distiller_webui',
-        '../components/components.gyp:invalidation',
+        '../components/components.gyp:invalidation_impl',
         '../components/components.gyp:onc_component',
         '../components/components.gyp:password_manager_core_browser',
         '../components/components.gyp:sync_driver',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index fc6f020..98c85c2 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2678,7 +2678,7 @@
         'chrome',
         'test_support_common',
         '../base/base.gyp:base',
-        '../components/components.gyp:invalidation',
+        '../components/components.gyp:invalidation_impl',
         '../components/components.gyp:invalidation_test_support',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 4c2f4c1..f2d67a0 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1661,7 +1661,7 @@
         '../components/components.gyp:gcm_driver_test_support',
         '../components/components.gyp:history_core_test_support',
         '../components/components.gyp:instance_id_test_support',
-        '../components/components.gyp:invalidation',
+        '../components/components.gyp:invalidation_impl',
         '../components/components.gyp:invalidation_test_support',
         '../components/components.gyp:metrics_test_support',
         '../components/components.gyp:omnibox_test_support',
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 7d9ae27..265e4cb 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -457,8 +457,8 @@ if (!is_android) {
       ":test_support",
       "//base",
       "//chrome",
-      "//components/invalidation",
-      "//components/invalidation:test_support",
+      "//components/invalidation/impl",
+      "//components/invalidation/impl:test_support",
       "//net",
       "//skia",
       "//sync",
diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn
index e6f05cb..dd67107 100644
--- a/chrome/test/android/BUILD.gn
+++ b/chrome/test/android/BUILD.gn
@@ -14,7 +14,7 @@ android_library("chrome_java_test_support") {
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_java_resources",
     "//components/bookmarks/common/android:bookmarks_java",
-    "//components/invalidation:java",
+    "//components/invalidation/impl:java",
     "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",