184 files changed, 723 insertions, 685 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",
diff --git a/components/BUILD.gn b/components/BUILD.gn
index 0d41d04..72d53f6 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -55,7 +55,7 @@ group("all_components") {
     "//components/history/core/common",
     "//components/history/core/test",
     "//components/infobars/core",
-    "//components/invalidation",
+    "//components/invalidation/impl",
     "//components/json_schema",
     "//components/keyed_service/content",
     "//components/language_usage_metrics",
@@ -193,7 +193,7 @@ group("all_components") {
       "//components/history/core/common",  # Should work, needs checking.
       "//components/history/core/test",  # Should work, needs checking.
       "//components/infobars/core",  # Should work, needs checking.
-      "//components/invalidation",  # Should work, needs checking.
+      "//components/invalidation/impl",  # Should work, needs checking.
       "//components/json_schema",  # Should work, needs checking.
       "//components/keyed_service/content",  # Blocked on content.
       "//components/navigation_interception",  # Blocked on content.
@@ -284,7 +284,7 @@ test("components_unittests") {
     "//components/domain_reliability:unit_tests",
     "//components/favicon_base:unit_tests",
     "//components/google/core/browser:unit_tests",
-    "//components/invalidation:unittests",
+    "//components/invalidation/impl:unittests",
     "//components/login:unit_tests",
     "//components/metrics:unit_tests",
     "//components/mime_util:unit_tests",
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index a0c3ae9..1b3c199 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -257,21 +257,21 @@
       'gcm_driver/instance_id/instance_id_driver_unittest.cc',
     ],
     'invalidation_unittest_sources': [
-      'invalidation/fake_invalidator_unittest.cc',
-      'invalidation/gcm_network_channel_unittest.cc',
-      'invalidation/invalidation_logger_unittest.cc',
-      'invalidation/invalidation_notifier_unittest.cc',
-      'invalidation/invalidator_registrar_unittest.cc',
-      'invalidation/non_blocking_invalidator_unittest.cc',
-      'invalidation/object_id_invalidation_map_unittest.cc',
-      'invalidation/p2p_invalidator_unittest.cc',
-      'invalidation/push_client_channel_unittest.cc',
-      'invalidation/registration_manager_unittest.cc',
-      'invalidation/single_object_invalidation_set_unittest.cc',
-      'invalidation/sync_invalidation_listener_unittest.cc',
-      'invalidation/sync_system_resources_unittest.cc',
-      'invalidation/ticl_invalidation_service_unittest.cc',
-      'invalidation/unacked_invalidation_set_unittest.cc',
+      'invalidation/impl/fake_invalidator_unittest.cc',
+      'invalidation/impl/gcm_network_channel_unittest.cc',
+      'invalidation/impl/invalidation_logger_unittest.cc',
+      'invalidation/impl/invalidation_notifier_unittest.cc',
+      'invalidation/impl/invalidator_registrar_unittest.cc',
+      'invalidation/impl/non_blocking_invalidator_unittest.cc',
+      'invalidation/impl/object_id_invalidation_map_unittest.cc',
+      'invalidation/impl/p2p_invalidator_unittest.cc',
+      'invalidation/impl/push_client_channel_unittest.cc',
+      'invalidation/impl/registration_manager_unittest.cc',
+      'invalidation/impl/single_object_invalidation_set_unittest.cc',
+      'invalidation/impl/sync_invalidation_listener_unittest.cc',
+      'invalidation/impl/sync_system_resources_unittest.cc',
+      'invalidation/impl/ticl_invalidation_service_unittest.cc',
+      'invalidation/impl/unacked_invalidation_set_unittest.cc',
     ],
     'json_schema_unittest_sources': [
       'json_schema/json_schema_validator_unittest.cc',
@@ -792,7 +792,7 @@
         'components.gyp:history_core_common',
         'components.gyp:history_core_test_support',
         'components.gyp:instance_id_test_support',
-        'components.gyp:invalidation',
+        'components.gyp:invalidation_impl',
         'components.gyp:invalidation_test_support',
         'components.gyp:json_schema',
         'components.gyp:keyed_service_core',
@@ -1024,8 +1024,8 @@
             'data_reduction_proxy/content/browser/data_reduction_proxy_debug_blocking_page_unittest.cc',
             'data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle_unittest.cc',
             'data_reduction_proxy/content/browser/data_reduction_proxy_debug_ui_manager_unittest.cc',
-            'invalidation/invalidation_logger_unittest.cc',
-            'invalidation/invalidation_service_android_unittest.cc',
+            'invalidation/impl/invalidation_logger_unittest.cc',
+            'invalidation/impl/invalidation_service_android_unittest.cc',
           ],
           'sources!': [
             'gcm_driver/gcm_account_mapper_unittest.cc',
diff --git a/components/invalidation.gypi b/components/invalidation.gypi
index 35fc77a..81e255e 100644
--- a/components/invalidation.gypi
+++ b/components/invalidation.gypi
@@ -5,101 +5,121 @@
 {
   'targets': [
     {
-      # GN version: //components/invalidation
-      'target_name': 'invalidation',
+      # GN version: //components/invalidation/public
+      'target_name': 'invalidation_public',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
-        '../base/base.gyp:base_prefs',
-        '../google_apis/google_apis.gyp:google_apis',
-        '../jingle/jingle.gyp:notifier',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         # TODO(akalin): Remove this (http://crbug.com/133352).
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
+      ],
+      'export_dependent_settings': [
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        # Note: sources list duplicated in GN build.
+        'invalidation/public/ack_handle.cc',
+        'invalidation/public/ack_handle.h',
+        'invalidation/public/ack_handler.cc',
+        'invalidation/public/ack_handler.h',
+        'invalidation/public/invalidation.cc',
+        'invalidation/public/invalidation.h',
+        'invalidation/public/invalidation_export.h',
+        'invalidation/public/invalidation_handler.cc',
+        'invalidation/public/invalidation_handler.h',
+        'invalidation/public/invalidation_service.h',
+        'invalidation/public/invalidation_util.cc',
+        'invalidation/public/invalidation_util.h',
+        'invalidation/public/invalidator_state.cc',
+        'invalidation/public/invalidator_state.h',
+        'invalidation/public/object_id_invalidation_map.cc',
+        'invalidation/public/object_id_invalidation_map.h',
+        'invalidation/public/single_object_invalidation_set.cc',
+        'invalidation/public/single_object_invalidation_set.h',
+      ],
+    },
+    {
+      # GN version: //components/invalidation/impl
+      'target_name': 'invalidation_impl',
+      'type': 'static_library',
+      'dependencies': [
+        'invalidation_public',
+        '../base/base.gyp:base',
+        '../base/base.gyp:base_i18n',
+        '../base/base.gyp:base_prefs',
+        '../google_apis/google_apis.gyp:google_apis',
+        '../jingle/jingle.gyp:notifier',
         'gcm_driver',
         'keyed_service_core',
         'pref_registry',
         'signin_core_browser',
       ],
       'export_dependent_settings': [
-        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+        'invalidation_public',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
-        'invalidation/ack_handle.cc',
-        'invalidation/ack_handle.h',
-        'invalidation/ack_handler.cc',
-        'invalidation/ack_handler.h',
-        'invalidation/invalidation.cc',
-        'invalidation/invalidation.h',
-        'invalidation/invalidation_handler.cc',
-        'invalidation/invalidation_handler.h',
-        '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_state_tracker.cc',
-        'invalidation/invalidation_state_tracker.h',
-        'invalidation/invalidation_switches.cc',
-        'invalidation/invalidation_switches.h',
-        'invalidation/invalidation_util.cc',
-        'invalidation/invalidation_util.h',
-        'invalidation/invalidator.cc',
-        'invalidation/invalidator.h',
-        'invalidation/invalidator_registrar.cc',
-        'invalidation/invalidator_registrar.h',
-        'invalidation/invalidator_state.cc',
-        'invalidation/invalidator_state.h',
-        'invalidation/invalidator_storage.cc',
-        'invalidation/invalidator_storage.h',
-        'invalidation/mock_ack_handler.cc',
-        'invalidation/mock_ack_handler.h',
-        'invalidation/object_id_invalidation_map.cc',
-        'invalidation/object_id_invalidation_map.h',
-        'invalidation/profile_invalidation_provider.cc',
-        'invalidation/profile_invalidation_provider.h',
-        'invalidation/single_object_invalidation_set.cc',
-        'invalidation/single_object_invalidation_set.h',
-        'invalidation/unacked_invalidation_set.cc',
-        'invalidation/unacked_invalidation_set.h',
+        'invalidation/impl/invalidation_logger.cc',
+        'invalidation/impl/invalidation_logger.h',
+        'invalidation/impl/invalidation_logger_observer.h',
+        'invalidation/impl/invalidation_prefs.cc',
+        'invalidation/impl/invalidation_prefs.h',
+        'invalidation/impl/invalidation_service_util.cc',
+        'invalidation/impl/invalidation_service_util.h',
+        'invalidation/impl/invalidation_state_tracker.cc',
+        'invalidation/impl/invalidation_state_tracker.h',
+        'invalidation/impl/invalidation_switches.cc',
+        'invalidation/impl/invalidation_switches.h',
+        'invalidation/impl/invalidator.cc',
+        'invalidation/impl/invalidator.h',
+        'invalidation/impl/invalidator_registrar.cc',
+        'invalidation/impl/invalidator_registrar.h',
+        'invalidation/impl/invalidator_storage.cc',
+        'invalidation/impl/invalidator_storage.h',
+        'invalidation/impl/mock_ack_handler.cc',
+        'invalidation/impl/mock_ack_handler.h',
+        'invalidation/impl/profile_invalidation_provider.cc',
+        'invalidation/impl/profile_invalidation_provider.h',
+        'invalidation/impl/unacked_invalidation_set.cc',
+        'invalidation/impl/unacked_invalidation_set.h',
       ],
       'conditions': [
           ['OS != "android"', {
             'sources': [
               # Note: sources list duplicated in GN build.
-              'invalidation/gcm_invalidation_bridge.cc',
-              'invalidation/gcm_invalidation_bridge.h',
-              'invalidation/gcm_network_channel.cc',
-              'invalidation/gcm_network_channel.h',
-              'invalidation/gcm_network_channel_delegate.h',
-              'invalidation/invalidation_notifier.cc',
-              'invalidation/invalidation_notifier.h',
-              'invalidation/non_blocking_invalidator.cc',
-              'invalidation/non_blocking_invalidator.h',
-              'invalidation/notifier_reason_util.cc',
-              'invalidation/notifier_reason_util.h',
-              'invalidation/p2p_invalidator.cc',
-              'invalidation/p2p_invalidator.h',
-              'invalidation/push_client_channel.cc',
-              'invalidation/push_client_channel.h',
-              'invalidation/registration_manager.cc',
-              'invalidation/registration_manager.h',
-              'invalidation/state_writer.h',
-              'invalidation/sync_invalidation_listener.cc',
-              'invalidation/sync_invalidation_listener.h',
-              'invalidation/sync_system_resources.cc',
-              'invalidation/sync_system_resources.h',
-              'invalidation/ticl_invalidation_service.cc',
-              'invalidation/ticl_invalidation_service.h',
-              'invalidation/ticl_settings_provider.cc',
-              'invalidation/ticl_settings_provider.h',
+              'invalidation/impl/gcm_invalidation_bridge.cc',
+              'invalidation/impl/gcm_invalidation_bridge.h',
+              'invalidation/impl/gcm_network_channel.cc',
+              'invalidation/impl/gcm_network_channel.h',
+              'invalidation/impl/gcm_network_channel_delegate.h',
+              'invalidation/impl/invalidation_notifier.cc',
+              'invalidation/impl/invalidation_notifier.h',
+              'invalidation/impl/non_blocking_invalidator.cc',
+              'invalidation/impl/non_blocking_invalidator.h',
+              'invalidation/impl/notifier_reason_util.cc',
+              'invalidation/impl/notifier_reason_util.h',
+              'invalidation/impl/p2p_invalidator.cc',
+              'invalidation/impl/p2p_invalidator.h',
+              'invalidation/impl/push_client_channel.cc',
+              'invalidation/impl/push_client_channel.h',
+              'invalidation/impl/registration_manager.cc',
+              'invalidation/impl/registration_manager.h',
+              'invalidation/impl/state_writer.h',
+              'invalidation/impl/sync_invalidation_listener.cc',
+              'invalidation/impl/sync_invalidation_listener.h',
+              'invalidation/impl/sync_system_resources.cc',
+              'invalidation/impl/sync_system_resources.h',
+              'invalidation/impl/ticl_invalidation_service.cc',
+              'invalidation/impl/ticl_invalidation_service.h',
+              'invalidation/impl/ticl_settings_provider.cc',
+              'invalidation/impl/ticl_settings_provider.h',
             ],
           }],
         ['OS == "android"', {
@@ -107,15 +127,14 @@
             'invalidation_jni_headers',
           ],
           'sources': [
-            'invalidation/android/component_jni_registrar.cc',
-            'invalidation/android/component_jni_registrar.h',
-            'invalidation/invalidation_service_android.cc',
-            'invalidation/invalidation_service_android.h',
+            'invalidation/impl/android/component_jni_registrar.cc',
+            'invalidation/impl/android/component_jni_registrar.h',
+            'invalidation/impl/invalidation_service_android.cc',
+            'invalidation/impl/invalidation_service_android.h',
           ],
         }],
       ],
     },
-
     {
       # GN version: //components/invalidation:test_support
       'target_name': 'invalidation_test_support',
@@ -137,29 +156,29 @@
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
-        'invalidation/fake_invalidation_handler.cc',
-        'invalidation/fake_invalidation_handler.h',
-        'invalidation/fake_invalidation_state_tracker.cc',
-        'invalidation/fake_invalidation_state_tracker.h',
-        'invalidation/fake_invalidator.cc',
-        'invalidation/fake_invalidator.h',
-        'invalidation/invalidation_service_test_template.cc',
-        'invalidation/invalidation_service_test_template.h',
-        'invalidation/invalidation_test_util.cc',
-        'invalidation/invalidation_test_util.h',
-        'invalidation/invalidator_test_template.cc',
-        'invalidation/invalidator_test_template.h',
-        'invalidation/object_id_invalidation_map_test_util.cc',
-        'invalidation/object_id_invalidation_map_test_util.h',
-        'invalidation/unacked_invalidation_set_test_util.cc',
-        'invalidation/unacked_invalidation_set_test_util.h',
+        'invalidation/impl/fake_invalidation_handler.cc',
+        'invalidation/impl/fake_invalidation_handler.h',
+        'invalidation/impl/fake_invalidation_state_tracker.cc',
+        'invalidation/impl/fake_invalidation_state_tracker.h',
+        'invalidation/impl/fake_invalidator.cc',
+        'invalidation/impl/fake_invalidator.h',
+        'invalidation/impl/invalidation_service_test_template.cc',
+        'invalidation/impl/invalidation_service_test_template.h',
+        'invalidation/impl/invalidation_test_util.cc',
+        'invalidation/impl/invalidation_test_util.h',
+        'invalidation/impl/invalidator_test_template.cc',
+        'invalidation/impl/invalidator_test_template.h',
+        'invalidation/impl/object_id_invalidation_map_test_util.cc',
+        'invalidation/impl/object_id_invalidation_map_test_util.h',
+        'invalidation/impl/unacked_invalidation_set_test_util.cc',
+        'invalidation/impl/unacked_invalidation_set_test_util.h',
       ],
       'conditions': [
           ['OS != "android"', {
             'sources': [
               # Note: sources list duplicated in GN build.
-              'invalidation/p2p_invalidation_service.cc',
-              'invalidation/p2p_invalidation_service.h',
+              'invalidation/impl/p2p_invalidation_service.cc',
+              'invalidation/impl/p2p_invalidation_service.h',
             ],
           }],
           ['OS == "android"', {
@@ -183,7 +202,7 @@
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib',
           ],
           'variables': {
-            'java_in_dir': 'invalidation/android/java',
+            'java_in_dir': 'invalidation/impl/android/java',
           },
           'includes': [ '../build/java.gypi' ],
         },
@@ -191,7 +210,7 @@
           'target_name': 'invalidation_proto_java',
           'type': 'none',
           'sources': [
-            'invalidation/android/proto/serialized_invalidation.proto',
+            'invalidation/impl/android/proto/serialized_invalidation.proto',
           ],
           'includes': [ '../build/protoc_java.gypi' ],
         },
@@ -203,7 +222,7 @@
             '../base/base.gyp:base_java_test_support',
           ],
           'variables': {
-            'java_in_dir': 'invalidation/android/javatests',
+            'java_in_dir': 'invalidation/impl/android/javatests',
           },
           'includes': [ '../build/java.gypi' ],
         },
@@ -219,7 +238,7 @@
           'variables': {
             'main_class': 'org.chromium.testing.local.JunitTestMain',
             'src_paths': [
-              'invalidation/android/junit/'
+              'invalidation/impl/android/junit/'
             ],
           },
           'includes': [ '../build/host_jar.gypi' ],
@@ -228,7 +247,7 @@
           'target_name': 'invalidation_jni_headers',
           'type': 'none',
           'sources': [
-            'invalidation/android/java/src/org/chromium/components/invalidation/InvalidationService.java',
+            'invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationService.java',
           ],
           'variables': {
             'jni_gen_package': 'components/invalidation',
diff --git a/components/invalidation/DEPS b/components/invalidation/DEPS
index bae9bc2..0fdd76d 100644
--- a/components/invalidation/DEPS
+++ b/components/invalidation/DEPS
@@ -1,19 +1,6 @@
 include_rules = [
+  # Explicitly forbid //content even though it is not allowed presently.
   "-content",
-
-  "+components/gcm_driver",
-  "+components/keyed_service",
-  "+components/pref_registry",
-  "+components/signin",
-
+  "-components/invalidation",
   "+google/cacheinvalidation",
-  "+google_apis/gaia",
-  "+google_apis/gcm",
-  "+jni",
-  "+jingle/notifier",
-  "+net/base/backoff_entry.h",
-  "+net/base/mock_host_resolver.h",
-  "+net/base/network_change_notifier.h",
-  "+net/http/http_status_code.h",
-  "+net/url_request",
 ]
diff --git a/components/invalidation/BUILD.gn b/components/invalidation/impl/BUILD.gn
index 7fa7b87..f01269c 100644
--- a/components/invalidation/BUILD.gn
+++ b/components/invalidation/impl/BUILD.gn
@@ -5,46 +5,29 @@ if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
-static_library("invalidation") {
+static_library("impl") {
   sources = [
-    "ack_handle.cc",
-    "ack_handle.h",
-    "ack_handler.cc",
-    "ack_handler.h",
-    "invalidation.cc",
-    "invalidation.h",
-    "invalidation_handler.cc",
-    "invalidation_handler.h",
     "invalidation_logger.cc",
     "invalidation_logger.h",
     "invalidation_logger_observer.h",
     "invalidation_prefs.cc",
     "invalidation_prefs.h",
-    "invalidation_service.h",
     "invalidation_service_util.cc",
     "invalidation_service_util.h",
     "invalidation_state_tracker.cc",
     "invalidation_state_tracker.h",
     "invalidation_switches.cc",
     "invalidation_switches.h",
-    "invalidation_util.cc",
-    "invalidation_util.h",
     "invalidator.cc",
     "invalidator.h",
     "invalidator_registrar.cc",
     "invalidator_registrar.h",
-    "invalidator_state.cc",
-    "invalidator_state.h",
     "invalidator_storage.cc",
     "invalidator_storage.h",
     "mock_ack_handler.cc",
     "mock_ack_handler.h",
-    "object_id_invalidation_map.cc",
-    "object_id_invalidation_map.h",
     "profile_invalidation_provider.cc",
     "profile_invalidation_provider.h",
-    "single_object_invalidation_set.cc",
-    "single_object_invalidation_set.h",
     "unacked_invalidation_set.cc",
     "unacked_invalidation_set.h",
   ]
@@ -78,23 +61,23 @@ static_library("invalidation") {
       "ticl_settings_provider.h",
     ]
   }
-
   public_deps = [
-    "//third_party/cacheinvalidation",
+    "//components/invalidation/public",
   ]
   deps = [
     "//base",
+    "//base:i18n",
+    "//base:prefs",
     "//components/gcm_driver",
     "//components/keyed_service/core",
     "//components/pref_registry",
     "//components/signin/core/browser",
     "//google_apis",
     "//jingle:notifier",
+    "//net:net",
 
     # TODO(sync): Remove this (http://crbug.com/133352);
     "//third_party/protobuf:protobuf_lite",
-
-    # "//third_party/cacheinvalidation/src/google/cacheinvalidation:cacheinvalidation_proto_cpp",
   ]
 
   if (is_android) {
@@ -111,7 +94,7 @@ static_library("invalidation") {
 group("unittests") {
   testonly = true
   deps = [
-    ":invalidation",
+    ":impl",
     ":test_support",
   ]
   if (is_android) {
diff --git a/components/invalidation/impl/DEPS b/components/invalidation/impl/DEPS
new file mode 100644
index 0000000..285832f
--- /dev/null
+++ b/components/invalidation/impl/DEPS
@@ -0,0 +1,17 @@
+include_rules = [
+  "+components/invalidation/public",
+
+  "+components/gcm_driver",
+  "+components/keyed_service",
+  "+components/pref_registry",
+  "+components/signin",
+
+  "+google_apis/gaia",
+  "+google_apis/gcm",
+  "+jni",
+  "+jingle/notifier",
+  "+net/base/backoff_entry.h",
+  "+net/base/network_change_notifier.h",
+  "+net/http/http_status_code.h",
+  "+net/url_request",
+]
diff --git a/components/invalidation/android/DEPS b/components/invalidation/impl/android/DEPS
index 05b9658..05b9658 100644
--- a/components/invalidation/android/DEPS
+++ b/components/invalidation/impl/android/DEPS
diff --git a/components/invalidation/android/component_jni_registrar.cc b/components/invalidation/impl/android/component_jni_registrar.cc
index 67cb5c7..aa1e615 100644
--- a/components/invalidation/android/component_jni_registrar.cc
+++ b/components/invalidation/impl/android/component_jni_registrar.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/android/component_jni_registrar.h"
+#include "components/invalidation/impl/android/component_jni_registrar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/basictypes.h"
-#include "components/invalidation/invalidation_service_android.h"
+#include "components/invalidation/impl/invalidation_service_android.h"
 
 namespace invalidation {
 
diff --git a/components/invalidation/android/component_jni_registrar.h b/components/invalidation/impl/android/component_jni_registrar.h
index 7fb44c4..d28d1b8 100644
--- a/components/invalidation/android/component_jni_registrar.h
+++ b/components/invalidation/impl/android/component_jni_registrar.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_ANDROID_COMPONENT_JNI_REGISTRAR_H_
-#define COMPONENTS_INVALIDATION_ANDROID_COMPONENT_JNI_REGISTRAR_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_ANDROID_COMPONENT_JNI_REGISTRAR_H_
+#define COMPONENTS_INVALIDATION_IMPL_ANDROID_COMPONENT_JNI_REGISTRAR_H_
 
 #include <jni.h>
 
@@ -18,4 +18,4 @@ bool RegisterInvalidationJni(JNIEnv* env);
 
 }  // namespace invalidation
 
-#endif  // COMPONENTS_INVALIDATION_ANDROID_COMPONENT_JNI_REGISTRAR_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_ANDROID_COMPONENT_JNI_REGISTRAR_H_
diff --git a/components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java b/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java
index 0b7fec4..0b7fec4 100644
--- a/components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java
+++ b/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java
diff --git a/components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationService.java b/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationService.java
index 96963ad..96963ad 100644
--- a/components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationService.java
+++ b/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationService.java
diff --git a/components/invalidation/android/java/src/org/chromium/components/invalidation/PendingInvalidation.java b/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/PendingInvalidation.java
index 89950f2..89950f2 100644
--- a/components/invalidation/android/java/src/org/chromium/components/invalidation/PendingInvalidation.java
+++ b/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/PendingInvalidation.java
diff --git a/components/invalidation/android/javatests/src/org/chromium/components/invalidation/InvalidationClientServiceTest.java b/components/invalidation/impl/android/javatests/src/org/chromium/components/invalidation/InvalidationClientServiceTest.java
index a4fd8e3..a4fd8e3 100644
--- a/components/invalidation/android/javatests/src/org/chromium/components/invalidation/InvalidationClientServiceTest.java
+++ b/components/invalidation/impl/android/javatests/src/org/chromium/components/invalidation/InvalidationClientServiceTest.java
diff --git a/components/invalidation/android/javatests/src/org/chromium/components/invalidation/TestableInvalidationClientService.java b/components/invalidation/impl/android/javatests/src/org/chromium/components/invalidation/TestableInvalidationClientService.java
index d52390a..d52390a 100644
--- a/components/invalidation/android/javatests/src/org/chromium/components/invalidation/TestableInvalidationClientService.java
+++ b/components/invalidation/impl/android/javatests/src/org/chromium/components/invalidation/TestableInvalidationClientService.java
diff --git a/components/invalidation/android/junit/src/org/chromium/components/invalidation/PendingInvalidationTest.java b/components/invalidation/impl/android/junit/src/org/chromium/components/invalidation/PendingInvalidationTest.java
index a1104fb..a1104fb 100644
--- a/components/invalidation/android/junit/src/org/chromium/components/invalidation/PendingInvalidationTest.java
+++ b/components/invalidation/impl/android/junit/src/org/chromium/components/invalidation/PendingInvalidationTest.java
diff --git a/components/invalidation/android/proto/serialized_invalidation.proto b/components/invalidation/impl/android/proto/serialized_invalidation.proto
index c191f7e..c191f7e 100644
--- a/components/invalidation/android/proto/serialized_invalidation.proto
+++ b/components/invalidation/impl/android/proto/serialized_invalidation.proto
diff --git a/components/invalidation/fake_invalidation_handler.cc b/components/invalidation/impl/fake_invalidation_handler.cc
index 949c756..4eaf56f 100644
--- a/components/invalidation/fake_invalidation_handler.cc
+++ b/components/invalidation/impl/fake_invalidation_handler.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 "components/invalidation/fake_invalidation_handler.h"
+#include "components/invalidation/impl/fake_invalidation_handler.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/fake_invalidation_handler.h b/components/invalidation/impl/fake_invalidation_handler.h
index 8ba2009..22b2ab4 100644
--- a/components/invalidation/fake_invalidation_handler.h
+++ b/components/invalidation/impl/fake_invalidation_handler.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_FAKE_INVALIDATION_HANDLER_H_
-#define COMPONENTS_INVALIDATION_FAKE_INVALIDATION_HANDLER_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_FAKE_INVALIDATION_HANDLER_H_
+#define COMPONENTS_INVALIDATION_IMPL_FAKE_INVALIDATION_HANDLER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "components/invalidation/invalidation_handler.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/public/invalidation_handler.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 
 namespace syncer {
 
@@ -39,4 +39,4 @@ class FakeInvalidationHandler : public InvalidationHandler {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_FAKE_INVALIDATION_HANDLER_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_FAKE_INVALIDATION_HANDLER_H_
diff --git a/components/invalidation/fake_invalidation_state_tracker.cc b/components/invalidation/impl/fake_invalidation_state_tracker.cc
index 6dda929..a5687a0 100644
--- a/components/invalidation/fake_invalidation_state_tracker.cc
+++ b/components/invalidation/impl/fake_invalidation_state_tracker.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 "components/invalidation/fake_invalidation_state_tracker.h"
+#include "components/invalidation/impl/fake_invalidation_state_tracker.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
diff --git a/components/invalidation/fake_invalidation_state_tracker.h b/components/invalidation/impl/fake_invalidation_state_tracker.h
index 1388bad..41ae0ac 100644
--- a/components/invalidation/fake_invalidation_state_tracker.h
+++ b/components/invalidation/impl/fake_invalidation_state_tracker.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_FAKE_INVALIDATION_STATE_TRACKER_H_
-#define COMPONENTS_INVALIDATION_FAKE_INVALIDATION_STATE_TRACKER_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_FAKE_INVALIDATION_STATE_TRACKER_H_
+#define COMPONENTS_INVALIDATION_IMPL_FAKE_INVALIDATION_STATE_TRACKER_H_
 
 #include "base/memory/weak_ptr.h"
-#include "components/invalidation/invalidation_state_tracker.h"
+#include "components/invalidation/impl/invalidation_state_tracker.h"
 
 namespace syncer {
 
@@ -38,4 +38,4 @@ class FakeInvalidationStateTracker
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_FAKE_INVALIDATION_STATE_TRACKER_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_FAKE_INVALIDATION_STATE_TRACKER_H_
diff --git a/components/invalidation/fake_invalidator.cc b/components/invalidation/impl/fake_invalidator.cc
index d82c397..6f17be8 100644
--- a/components/invalidation/fake_invalidator.cc
+++ b/components/invalidation/impl/fake_invalidator.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/fake_invalidator.h"
+#include "components/invalidation/impl/fake_invalidator.h"
 
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/fake_invalidator.h b/components/invalidation/impl/fake_invalidator.h
index 2d24361..242a8ff 100644
--- a/components/invalidation/fake_invalidator.h
+++ b/components/invalidation/impl/fake_invalidator.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_FAKE_INVALIDATOR_H_
-#define COMPONENTS_INVALIDATION_FAKE_INVALIDATOR_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_FAKE_INVALIDATOR_H_
+#define COMPONENTS_INVALIDATION_IMPL_FAKE_INVALIDATOR_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
-#include "components/invalidation/invalidation_util.h"
-#include "components/invalidation/invalidator.h"
-#include "components/invalidation/invalidator_registrar.h"
+#include "components/invalidation/impl/invalidator.h"
+#include "components/invalidation/impl/invalidator_registrar.h"
+#include "components/invalidation/public/invalidation_util.h"
 
 namespace syncer {
 
@@ -49,4 +49,4 @@ class FakeInvalidator : public Invalidator {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_FAKE_INVALIDATOR_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_FAKE_INVALIDATOR_H_
diff --git a/components/invalidation/fake_invalidator_unittest.cc b/components/invalidation/impl/fake_invalidator_unittest.cc
index d7c2d17..3e9fa7c 100644
--- a/components/invalidation/fake_invalidator_unittest.cc
+++ b/components/invalidation/impl/fake_invalidator_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "components/invalidation/fake_invalidator.h"
-#include "components/invalidation/invalidator_test_template.h"
+#include "components/invalidation/impl/fake_invalidator.h"
+#include "components/invalidation/impl/invalidator_test_template.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
diff --git a/components/invalidation/gcm_invalidation_bridge.cc b/components/invalidation/impl/gcm_invalidation_bridge.cc
index ef09594..7698413 100644
--- a/components/invalidation/gcm_invalidation_bridge.cc
+++ b/components/invalidation/impl/gcm_invalidation_bridge.cc
@@ -7,7 +7,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "components/gcm_driver/gcm_driver.h"
-#include "components/invalidation/gcm_invalidation_bridge.h"
+#include "components/invalidation/impl/gcm_invalidation_bridge.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "google_apis/gaia/gaia_constants.h"
diff --git a/components/invalidation/gcm_invalidation_bridge.h b/components/invalidation/impl/gcm_invalidation_bridge.h
index 9f9fe42..2e590dc 100644
--- a/components/invalidation/gcm_invalidation_bridge.h
+++ b/components/invalidation/impl/gcm_invalidation_bridge.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_GCM_INVALIDATION_BRIDGE_H_
-#define COMPONENTS_INVALIDATION_GCM_INVALIDATION_BRIDGE_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_GCM_INVALIDATION_BRIDGE_H_
+#define COMPONENTS_INVALIDATION_IMPL_GCM_INVALIDATION_BRIDGE_H_
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
@@ -12,7 +12,7 @@
 #include "components/gcm_driver/gcm_app_handler.h"
 #include "components/gcm_driver/gcm_client.h"
 #include "components/gcm_driver/gcm_connection_observer.h"
-#include "components/invalidation/gcm_network_channel_delegate.h"
+#include "components/invalidation/impl/gcm_network_channel_delegate.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
 class IdentityProvider;
@@ -110,4 +110,4 @@ class GCMInvalidationBridge : public gcm::GCMAppHandler,
 
 }  // namespace invalidation
 
-#endif  // COMPONENTS_INVALIDATION_GCM_INVALIDATION_BRIDGE_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_GCM_INVALIDATION_BRIDGE_H_
diff --git a/components/invalidation/gcm_network_channel.cc b/components/invalidation/impl/gcm_network_channel.cc
index 0c53612..ebe9e59 100644
--- a/components/invalidation/gcm_network_channel.cc
+++ b/components/invalidation/impl/gcm_network_channel.cc
@@ -19,8 +19,8 @@
 #include "google/cacheinvalidation/channel_common.pb.h"
 #include "google/cacheinvalidation/types.pb.h"
 #endif
-#include "components/invalidation/gcm_network_channel.h"
-#include "components/invalidation/gcm_network_channel_delegate.h"
+#include "components/invalidation/impl/gcm_network_channel.h"
+#include "components/invalidation/impl/gcm_network_channel_delegate.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
diff --git a/components/invalidation/gcm_network_channel.h b/components/invalidation/impl/gcm_network_channel.h
index bf84518..511088c 100644
--- a/components/invalidation/gcm_network_channel.h
+++ b/components/invalidation/impl/gcm_network_channel.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_H_
-#define COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_GCM_NETWORK_CHANNEL_H_
+#define COMPONENTS_INVALIDATION_IMPL_GCM_NETWORK_CHANNEL_H_
 
 #include <string>
 
@@ -11,9 +11,9 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
-#include "components/invalidation/gcm_network_channel_delegate.h"
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/sync_system_resources.h"
+#include "components/invalidation/impl/gcm_network_channel_delegate.h"
+#include "components/invalidation/impl/sync_system_resources.h"
+#include "components/invalidation/public/invalidation_export.h"
 #include "net/base/backoff_entry.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_fetcher_delegate.h"
@@ -139,4 +139,4 @@ class INVALIDATION_EXPORT_PRIVATE GCMNetworkChannel
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_GCM_NETWORK_CHANNEL_H_
diff --git a/components/invalidation/gcm_network_channel_delegate.h b/components/invalidation/impl/gcm_network_channel_delegate.h
index c1626a6..0a03563 100644
--- a/components/invalidation/gcm_network_channel_delegate.h
+++ b/components/invalidation/impl/gcm_network_channel_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_DELEGATE_H_
-#define COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_DELEGATE_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_GCM_NETWORK_CHANNEL_DELEGATE_H_
+#define COMPONENTS_INVALIDATION_IMPL_GCM_NETWORK_CHANNEL_DELEGATE_H_
 
 #include <string>
 
@@ -49,4 +49,4 @@ class GCMNetworkChannelDelegate {
 };
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_DELEGATE_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_GCM_NETWORK_CHANNEL_DELEGATE_H_
diff --git a/components/invalidation/gcm_network_channel_unittest.cc b/components/invalidation/impl/gcm_network_channel_unittest.cc
index bec5489..b0f7ba0 100644
--- a/components/invalidation/gcm_network_channel_unittest.cc
+++ b/components/invalidation/impl/gcm_network_channel_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
-#include "components/invalidation/gcm_network_channel.h"
+#include "components/invalidation/impl/gcm_network_channel.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_test_util.h"
diff --git a/components/invalidation/invalidation_logger.cc b/components/invalidation/impl/invalidation_logger.cc
index c432686..5628a24 100644
--- a/components/invalidation/invalidation_logger.cc
+++ b/components/invalidation/impl/invalidation_logger.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/invalidation_logger.h"
+#include "components/invalidation/impl/invalidation_logger.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
-#include "components/invalidation/invalidation_handler.h"
-#include "components/invalidation/invalidation_logger_observer.h"
+#include "components/invalidation/impl/invalidation_logger_observer.h"
+#include "components/invalidation/public/invalidation_handler.h"
 
 namespace invalidation {
 class InvalidationLoggerObserver;
diff --git a/components/invalidation/invalidation_logger.h b/components/invalidation/impl/invalidation_logger.h
index fe44508..b74daf8 100644
--- a/components/invalidation/invalidation_logger.h
+++ b/components/invalidation/impl/invalidation_logger.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATION_LOGGER_H_
-#define COMPONENTS_INVALIDATION_INVALIDATION_LOGGER_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_LOGGER_H_
+#define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_LOGGER_H_
 
 #include <map>
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
-#include "components/invalidation/invalidation_util.h"
-#include "components/invalidation/invalidator_state.h"
+#include "components/invalidation/public/invalidation_util.h"
+#include "components/invalidation/public/invalidator_state.h"
 
 namespace base {
 class DictionaryValue;
@@ -99,4 +99,4 @@ class InvalidationLogger {
 
 }  // namespace invalidation
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATION_LOGGER_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_INVALIDATION_LOGGER_H_
diff --git a/components/invalidation/invalidation_logger_observer.h b/components/invalidation/impl/invalidation_logger_observer.h
index d754b93..63774cd 100644
--- a/components/invalidation/invalidation_logger_observer.h
+++ b/components/invalidation/impl/invalidation_logger_observer.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATION_LOGGER_OBSERVER_H_
-#define COMPONENTS_INVALIDATION_INVALIDATION_LOGGER_OBSERVER_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_LOGGER_OBSERVER_H_
+#define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_LOGGER_OBSERVER_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "components/invalidation/invalidation_util.h"
-#include "components/invalidation/invalidator_state.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/public/invalidation_util.h"
+#include "components/invalidation/public/invalidator_state.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 
 namespace base {
 class DictionaryValue;
@@ -43,4 +43,4 @@ class InvalidationLoggerObserver {
 
 }  // namespace invalidation
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATION_LOGGER_OBSERVER_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_INVALIDATION_LOGGER_OBSERVER_H_
diff --git a/components/invalidation/invalidation_logger_unittest.cc b/components/invalidation/impl/invalidation_logger_unittest.cc
index 28e5407..9e984b0 100644
--- a/components/invalidation/invalidation_logger_unittest.cc
+++ b/components/invalidation/impl/invalidation_logger_unittest.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/invalidation_logger.h"
-#include "components/invalidation/invalidation_logger_observer.h"
+#include "components/invalidation/impl/invalidation_logger.h"
+#include "components/invalidation/impl/invalidation_logger_observer.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/invalidation/invalidation_notifier.cc b/components/invalidation/impl/invalidation_notifier.cc
index 195f73a..247bbbf 100644
--- a/components/invalidation/invalidation_notifier.cc
+++ b/components/invalidation/impl/invalidation_notifier.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/invalidation_notifier.h"
+#include "components/invalidation/impl/invalidation_notifier.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
-#include "components/invalidation/invalidation_handler.h"
+#include "components/invalidation/public/invalidation_handler.h"
 #include "google/cacheinvalidation/include/invalidation-client-factory.h"
 #include "jingle/notifier/listener/push_client.h"
 #include "net/url_request/url_request_context.h"
diff --git a/components/invalidation/invalidation_notifier.h b/components/invalidation/impl/invalidation_notifier.h
index 112ff64..db53e92 100644
--- a/components/invalidation/invalidation_notifier.h
+++ b/components/invalidation/impl/invalidation_notifier.h
@@ -9,8 +9,8 @@
 // You probably don't want to use this directly; use
 // NonBlockingInvalidator.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATION_NOTIFIER_H_
-#define COMPONENTS_INVALIDATION_INVALIDATION_NOTIFIER_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_NOTIFIER_H_
+#define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_NOTIFIER_H_
 
 #include <string>
 
@@ -21,11 +21,11 @@
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/non_thread_safe.h"
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/invalidation_state_tracker.h"
-#include "components/invalidation/invalidator.h"
-#include "components/invalidation/invalidator_registrar.h"
-#include "components/invalidation/sync_invalidation_listener.h"
+#include "components/invalidation/impl/invalidation_state_tracker.h"
+#include "components/invalidation/impl/invalidator.h"
+#include "components/invalidation/impl/invalidator_registrar.h"
+#include "components/invalidation/impl/sync_invalidation_listener.h"
+#include "components/invalidation/public/invalidation_export.h"
 
 namespace notifier {
 class PushClient;
@@ -106,4 +106,4 @@ class INVALIDATION_EXPORT_PRIVATE InvalidationNotifier
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATION_NOTIFIER_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_INVALIDATION_NOTIFIER_H_
diff --git a/components/invalidation/invalidation_notifier_unittest.cc b/components/invalidation/impl/invalidation_notifier_unittest.cc
index 74a1386..58b7d14 100644
--- a/components/invalidation/invalidation_notifier_unittest.cc
+++ b/components/invalidation/impl/invalidation_notifier_unittest.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/invalidation_notifier.h"
+#include "components/invalidation/impl/invalidation_notifier.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/thread_task_runner_handle.h"
-#include "components/invalidation/fake_invalidation_handler.h"
-#include "components/invalidation/fake_invalidation_state_tracker.h"
-#include "components/invalidation/invalidation_state_tracker.h"
-#include "components/invalidation/invalidator_test_template.h"
-#include "components/invalidation/push_client_channel.h"
+#include "components/invalidation/impl/fake_invalidation_handler.h"
+#include "components/invalidation/impl/fake_invalidation_state_tracker.h"
+#include "components/invalidation/impl/invalidation_state_tracker.h"
+#include "components/invalidation/impl/invalidator_test_template.h"
+#include "components/invalidation/impl/push_client_channel.h"
 #include "jingle/notifier/base/fake_base_task.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "jingle/notifier/listener/fake_push_client.h"
diff --git a/components/invalidation/invalidation_prefs.cc b/components/invalidation/impl/invalidation_prefs.cc
index 5f71bd0..09bfab6 100644
--- a/components/invalidation/invalidation_prefs.cc
+++ b/components/invalidation/impl/invalidation_prefs.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 "components/invalidation/invalidation_prefs.h"
+#include "components/invalidation/impl/invalidation_prefs.h"
 
 namespace invalidation {
 namespace prefs {
diff --git a/components/invalidation/invalidation_prefs.h b/components/invalidation/impl/invalidation_prefs.h
index 2fdc5f2..2fdc5f2 100644
--- a/components/invalidation/invalidation_prefs.h
+++ b/components/invalidation/impl/invalidation_prefs.h
diff --git a/components/invalidation/invalidation_service_android.cc b/components/invalidation/impl/invalidation_service_android.cc
index b91f8e8..06e24f5 100644
--- a/components/invalidation/invalidation_service_android.cc
+++ b/components/invalidation/impl/invalidation_service_android.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/invalidation_service_android.h"
+#include "components/invalidation/impl/invalidation_service_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/callback.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "jni/InvalidationService_jni.h"
 
diff --git a/components/invalidation/invalidation_service_android.h b/components/invalidation/impl/invalidation_service_android.h
index d3f697c..bd135fc 100644
--- a/components/invalidation/invalidation_service_android.h
+++ b/components/invalidation/impl/invalidation_service_android.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_ANDROID_H_
-#define COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_ANDROID_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_ANDROID_H_
+#define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_ANDROID_H_
 
 #include <jni.h>
 #include <map>
@@ -14,9 +14,9 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
-#include "components/invalidation/invalidation_logger.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/invalidator_registrar.h"
+#include "components/invalidation/impl/invalidation_logger.h"
+#include "components/invalidation/impl/invalidator_registrar.h"
+#include "components/invalidation/public/invalidation_service.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 namespace invalidation {
@@ -92,4 +92,4 @@ class InvalidationServiceAndroid
 
 }  // namespace invalidation
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_ANDROID_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_ANDROID_H_
diff --git a/components/invalidation/invalidation_service_android_unittest.cc b/components/invalidation/impl/invalidation_service_android_unittest.cc
index ed295bb..832f1fc 100644
--- a/components/invalidation/invalidation_service_android_unittest.cc
+++ b/components/invalidation/impl/invalidation_service_android_unittest.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/invalidation_service_android.h"
+#include "components/invalidation/impl/invalidation_service_android.h"
 
 #include "base/android/jni_android.h"
-#include "components/invalidation/fake_invalidation_handler.h"
-#include "components/invalidation/invalidation_service_test_template.h"
+#include "components/invalidation/impl/fake_invalidation_handler.h"
+#include "components/invalidation/impl/invalidation_service_test_template.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace invalidation {
diff --git a/components/invalidation/invalidation_service_test_template.cc b/components/invalidation/impl/invalidation_service_test_template.cc
index 3205c6f..3eedd73 100644
--- a/components/invalidation/invalidation_service_test_template.cc
+++ b/components/invalidation/impl/invalidation_service_test_template.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 "components/invalidation/invalidation_service_test_template.h"
+#include "components/invalidation/impl/invalidation_service_test_template.h"
 
 namespace internal {
 
diff --git a/components/invalidation/invalidation_service_test_template.h b/components/invalidation/impl/invalidation_service_test_template.h
index 3f2e764..d1d6332 100644
--- a/components/invalidation/invalidation_service_test_template.h
+++ b/components/invalidation/impl/invalidation_service_test_template.h
@@ -68,17 +68,17 @@
 //
 // Easy!
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_TEST_TEMPLATE_H_
-#define COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_TEST_TEMPLATE_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_TEST_TEMPLATE_H_
+#define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_TEST_TEMPLATE_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "components/invalidation/ack_handle.h"
-#include "components/invalidation/fake_invalidation_handler.h"
-#include "components/invalidation/invalidation.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/object_id_invalidation_map.h"
-#include "components/invalidation/object_id_invalidation_map_test_util.h"
+#include "components/invalidation/impl/fake_invalidation_handler.h"
+#include "components/invalidation/impl/object_id_invalidation_map_test_util.h"
+#include "components/invalidation/public/ack_handle.h"
+#include "components/invalidation/public/invalidation.h"
+#include "components/invalidation/public/invalidation_service.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -410,4 +410,4 @@ REGISTER_TYPED_TEST_CASE_P(InvalidationServiceTest,
                            EmptySetUnregisters,
                            GetInvalidatorStateAlwaysCurrent);
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_TEST_TEMPLATE_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_TEST_TEMPLATE_H_
diff --git a/components/invalidation/invalidation_service_util.cc b/components/invalidation/impl/invalidation_service_util.cc
index 0049bca..52f148f 100644
--- a/components/invalidation/invalidation_service_util.cc
+++ b/components/invalidation/impl/invalidation_service_util.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/invalidation_service_util.h"
+#include "components/invalidation/impl/invalidation_service_util.h"
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
-#include "components/invalidation/invalidation_switches.h"
+#include "components/invalidation/impl/invalidation_switches.h"
 
 namespace invalidation {
 
diff --git a/components/invalidation/invalidation_service_util.h b/components/invalidation/impl/invalidation_service_util.h
index 9a1aa6b..84c240e 100644
--- a/components/invalidation/invalidation_service_util.h
+++ b/components/invalidation/impl/invalidation_service_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_UTIL_H_
-#define COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_UTIL_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_UTIL_H_
+#define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_UTIL_H_
 
 #include "jingle/notifier/base/notifier_options.h"
 
@@ -22,4 +22,4 @@ std::string GenerateInvalidatorClientId();
 
 }  // namespace invalidation
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_UTIL_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_UTIL_H_
diff --git a/components/invalidation/invalidation_state_tracker.cc b/components/invalidation/impl/invalidation_state_tracker.cc
index 4bc79df..6e33134 100644
--- a/components/invalidation/invalidation_state_tracker.cc
+++ b/components/invalidation/impl/invalidation_state_tracker.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 "components/invalidation/invalidation_state_tracker.h"
+#include "components/invalidation/impl/invalidation_state_tracker.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/invalidation_state_tracker.h b/components/invalidation/impl/invalidation_state_tracker.h
index 6e03dab..2bfb5d8 100644
--- a/components/invalidation/invalidation_state_tracker.h
+++ b/components/invalidation/impl/invalidation_state_tracker.h
@@ -9,8 +9,8 @@
 // - Bootstrap data for the invalidation client.
 // - Payloads and locally generated ack handles, to support local acking.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATION_STATE_TRACKER_H_
-#define COMPONENTS_INVALIDATION_INVALIDATION_STATE_TRACKER_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_STATE_TRACKER_H_
+#define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_STATE_TRACKER_H_
 
 #include <map>
 #include <string>
@@ -18,10 +18,10 @@
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
-#include "components/invalidation/invalidation.h"
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/invalidation_util.h"
-#include "components/invalidation/unacked_invalidation_set.h"
+#include "components/invalidation/impl/unacked_invalidation_set.h"
+#include "components/invalidation/public/invalidation.h"
+#include "components/invalidation/public/invalidation_export.h"
+#include "components/invalidation/public/invalidation_util.h"
 #include "google/cacheinvalidation/include/types.h"
 
 namespace base {
@@ -61,4 +61,4 @@ class INVALIDATION_EXPORT InvalidationStateTracker {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATION_STATE_TRACKER_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_INVALIDATION_STATE_TRACKER_H_
diff --git a/components/invalidation/invalidation_switches.cc b/components/invalidation/impl/invalidation_switches.cc
index dffc251..e139cfe 100644
--- a/components/invalidation/invalidation_switches.cc
+++ b/components/invalidation/impl/invalidation_switches.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 "components/invalidation/invalidation_switches.h"
+#include "components/invalidation/impl/invalidation_switches.h"
 
 namespace invalidation {
 namespace switches {
diff --git a/components/invalidation/invalidation_switches.h b/components/invalidation/impl/invalidation_switches.h
index f38b457..a341be1 100644
--- a/components/invalidation/invalidation_switches.h
+++ b/components/invalidation/impl/invalidation_switches.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATION_SWITCHES_H
-#define COMPONENTS_INVALIDATION_INVALIDATION_SWITCHES_H
+#ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SWITCHES_H
+#define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SWITCHES_H
 
 namespace invalidation {
 namespace switches {
@@ -14,4 +14,4 @@ extern const char kSyncAllowInsecureXmppConnection[];
 }  // namespace switches
 }  // namespace invalidation
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATION_SWITCHES_H
+#endif  // COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SWITCHES_H
diff --git a/components/invalidation/invalidation_test_util.cc b/components/invalidation/impl/invalidation_test_util.cc
index 6fcd8ef..f0ae738 100644
--- a/components/invalidation/invalidation_test_util.cc
+++ b/components/invalidation/impl/invalidation_test_util.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/invalidation_test_util.h"
+#include "components/invalidation/impl/invalidation_test_util.h"
 
 #include "base/basictypes.h"
 #include "base/json/json_writer.h"
 #include "base/json/string_escape.h"
 #include "base/values.h"
-#include "components/invalidation/invalidation.h"
+#include "components/invalidation/public/invalidation.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/invalidation_test_util.h b/components/invalidation/impl/invalidation_test_util.h
index c039494..bd1ef11 100644
--- a/components/invalidation/invalidation_test_util.h
+++ b/components/invalidation/impl/invalidation_test_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATION_TEST_UTIL_H_
-#define COMPONENTS_INVALIDATION_INVALIDATION_TEST_UTIL_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_TEST_UTIL_H_
+#define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_TEST_UTIL_H_
 
 #include <iosfwd>
 
@@ -23,4 +23,4 @@ void PrintTo(const Invalidation& invalidation, ::std::ostream* os);
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATION_TEST_UTIL_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_INVALIDATION_TEST_UTIL_H_
diff --git a/components/invalidation/invalidator.cc b/components/invalidation/impl/invalidator.cc
index 5c92b98..5b3035c 100644
--- a/components/invalidation/invalidator.cc
+++ b/components/invalidation/impl/invalidator.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 "components/invalidation/invalidator.h"
+#include "components/invalidation/impl/invalidator.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/invalidator.h b/components/invalidation/impl/invalidator.h
index fc869b1..6fcdbe2 100644
--- a/components/invalidation/invalidator.h
+++ b/components/invalidation/impl/invalidator.h
@@ -6,15 +6,15 @@
 // invalidations for registered object IDs. The corresponding
 // InvalidationHandler is notifier when such an event occurs.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATOR_H_
-#define COMPONENTS_INVALIDATION_INVALIDATOR_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATOR_H_
+#define COMPONENTS_INVALIDATION_IMPL_INVALIDATOR_H_
 
 #include <string>
 
 #include "base/callback.h"
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/invalidation_util.h"
-#include "components/invalidation/invalidator_state.h"
+#include "components/invalidation/public/invalidation_export.h"
+#include "components/invalidation/public/invalidation_util.h"
+#include "components/invalidation/public/invalidator_state.h"
 
 namespace syncer {
 class InvalidationHandler;
@@ -86,4 +86,4 @@ class INVALIDATION_EXPORT Invalidator {
 };
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATOR_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_INVALIDATOR_H_
diff --git a/components/invalidation/invalidator_registrar.cc b/components/invalidation/impl/invalidator_registrar.cc
index af0ebca..903cf72 100644
--- a/components/invalidation/invalidator_registrar.cc
+++ b/components/invalidation/impl/invalidator_registrar.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/invalidator_registrar.h"
+#include "components/invalidation/impl/invalidator_registrar.h"
 
 #include <cstddef>
 #include <iterator>
 #include <utility>
 
 #include "base/logging.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/invalidator_registrar.h b/components/invalidation/impl/invalidator_registrar.h
index 9acf26c..741676c 100644
--- a/components/invalidation/invalidator_registrar.h
+++ b/components/invalidation/impl/invalidator_registrar.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATOR_REGISTRAR_H_
-#define COMPONENTS_INVALIDATION_INVALIDATOR_REGISTRAR_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATOR_REGISTRAR_H_
+#define COMPONENTS_INVALIDATION_IMPL_INVALIDATOR_REGISTRAR_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/invalidation_handler.h"
-#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/public/invalidation_export.h"
+#include "components/invalidation/public/invalidation_handler.h"
+#include "components/invalidation/public/invalidation_util.h"
 
 namespace invalidation {
 class ObjectId;
@@ -94,4 +94,4 @@ class INVALIDATION_EXPORT InvalidatorRegistrar {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATOR_REGISTRAR_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_INVALIDATOR_REGISTRAR_H_
diff --git a/components/invalidation/invalidator_registrar_unittest.cc b/components/invalidation/impl/invalidator_registrar_unittest.cc
index 6886382..0313e14 100644
--- a/components/invalidation/invalidator_registrar_unittest.cc
+++ b/components/invalidation/impl/invalidator_registrar_unittest.cc
@@ -5,9 +5,9 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "components/invalidation/fake_invalidation_handler.h"
-#include "components/invalidation/invalidator_registrar.h"
-#include "components/invalidation/invalidator_test_template.h"
+#include "components/invalidation/impl/fake_invalidation_handler.h"
+#include "components/invalidation/impl/invalidator_registrar.h"
+#include "components/invalidation/impl/invalidator_test_template.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/invalidation/invalidator_storage.cc b/components/invalidation/impl/invalidator_storage.cc
index cd7ae9c..2e20b6c 100644
--- a/components/invalidation/invalidator_storage.cc
+++ b/components/invalidation/impl/invalidator_storage.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 "components/invalidation/invalidator_storage.h"
+#include "components/invalidation/impl/invalidator_storage.h"
 
 #include <string>
 #include <utility>
@@ -14,8 +14,8 @@
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
-#include "components/invalidation/invalidation_prefs.h"
-#include "components/invalidation/unacked_invalidation_set.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 "google/cacheinvalidation/types.pb.h"
 
diff --git a/components/invalidation/invalidator_storage.h b/components/invalidation/impl/invalidator_storage.h
index 3606188..238dbab 100644
--- a/components/invalidation/invalidator_storage.h
+++ b/components/invalidation/impl/invalidator_storage.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATOR_STORAGE_H_
-#define COMPONENTS_INVALIDATION_INVALIDATOR_STORAGE_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATOR_STORAGE_H_
+#define COMPONENTS_INVALIDATION_IMPL_INVALIDATOR_STORAGE_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
-#include "components/invalidation/invalidation_state_tracker.h"
+#include "components/invalidation/impl/invalidation_state_tracker.h"
 
 class PrefRegistrySimple;
 class PrefService;
@@ -56,4 +56,4 @@ class InvalidatorStorage : public syncer::InvalidationStateTracker {
 
 }  // namespace invalidation
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATOR_STORAGE_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_INVALIDATOR_STORAGE_H_
diff --git a/components/invalidation/invalidator_test_template.cc b/components/invalidation/impl/invalidator_test_template.cc
index 8f62630..46d0960 100644
--- a/components/invalidation/invalidator_test_template.cc
+++ b/components/invalidation/impl/invalidator_test_template.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 "components/invalidation/invalidator_test_template.h"
+#include "components/invalidation/impl/invalidator_test_template.h"
 
 namespace syncer {
 namespace internal {
diff --git a/components/invalidation/invalidator_test_template.h b/components/invalidation/impl/invalidator_test_template.h
index da4d455..cf43a8b 100644
--- a/components/invalidation/invalidator_test_template.h
+++ b/components/invalidation/impl/invalidator_test_template.h
@@ -74,15 +74,15 @@
 //
 // Easy!
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATOR_TEST_TEMPLATE_H_
-#define COMPONENTS_INVALIDATION_INVALIDATOR_TEST_TEMPLATE_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATOR_TEST_TEMPLATE_H_
+#define COMPONENTS_INVALIDATION_IMPL_INVALIDATOR_TEST_TEMPLATE_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "components/invalidation/fake_invalidation_handler.h"
-#include "components/invalidation/fake_invalidation_state_tracker.h"
-#include "components/invalidation/invalidator.h"
-#include "components/invalidation/object_id_invalidation_map_test_util.h"
+#include "components/invalidation/impl/fake_invalidation_handler.h"
+#include "components/invalidation/impl/fake_invalidation_state_tracker.h"
+#include "components/invalidation/impl/invalidator.h"
+#include "components/invalidation/impl/object_id_invalidation_map_test_util.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -399,4 +399,4 @@ REGISTER_TYPED_TEST_CASE_P(InvalidatorTest,
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATOR_TEST_TEMPLATE_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_INVALIDATOR_TEST_TEMPLATE_H_
diff --git a/components/invalidation/mock_ack_handler.cc b/components/invalidation/impl/mock_ack_handler.cc
index c43ed33..859c77a 100644
--- a/components/invalidation/mock_ack_handler.cc
+++ b/components/invalidation/impl/mock_ack_handler.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/mock_ack_handler.h"
+#include "components/invalidation/impl/mock_ack_handler.h"
 
 #include "base/thread_task_runner_handle.h"
-#include "components/invalidation/ack_handle.h"
-#include "components/invalidation/invalidation.h"
+#include "components/invalidation/public/ack_handle.h"
+#include "components/invalidation/public/invalidation.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/mock_ack_handler.h b/components/invalidation/impl/mock_ack_handler.h
index 8afcb4f..1e5effc 100644
--- a/components/invalidation/mock_ack_handler.h
+++ b/components/invalidation/impl/mock_ack_handler.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_MOCK_ACK_HANDLER_H_
-#define COMPONENTS_INVALIDATION_MOCK_ACK_HANDLER_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_MOCK_ACK_HANDLER_H_
+#define COMPONENTS_INVALIDATION_IMPL_MOCK_ACK_HANDLER_H_
 
 #include <map>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
-#include "components/invalidation/ack_handler.h"
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/public/ack_handler.h"
+#include "components/invalidation/public/invalidation_export.h"
+#include "components/invalidation/public/invalidation_util.h"
 
 namespace syncer {
 
@@ -74,4 +74,4 @@ class INVALIDATION_EXPORT MockAckHandler
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_MOCK_ACK_HANDLER_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_MOCK_ACK_HANDLER_H_
diff --git a/components/invalidation/non_blocking_invalidator.cc b/components/invalidation/impl/non_blocking_invalidator.cc
index 2ae6926..100168c 100644
--- a/components/invalidation/non_blocking_invalidator.cc
+++ b/components/invalidation/impl/non_blocking_invalidator.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 "components/invalidation/non_blocking_invalidator.h"
+#include "components/invalidation/impl/non_blocking_invalidator.h"
 
 #include <cstddef>
 
@@ -13,11 +13,11 @@
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
-#include "components/invalidation/gcm_network_channel_delegate.h"
-#include "components/invalidation/invalidation_handler.h"
-#include "components/invalidation/invalidation_notifier.h"
-#include "components/invalidation/object_id_invalidation_map.h"
-#include "components/invalidation/sync_system_resources.h"
+#include "components/invalidation/impl/gcm_network_channel_delegate.h"
+#include "components/invalidation/impl/invalidation_notifier.h"
+#include "components/invalidation/impl/sync_system_resources.h"
+#include "components/invalidation/public/invalidation_handler.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "jingle/notifier/listener/push_client.h"
 
 namespace syncer {
diff --git a/components/invalidation/non_blocking_invalidator.h b/components/invalidation/impl/non_blocking_invalidator.h
index 73db280..22e7f4e 100644
--- a/components/invalidation/non_blocking_invalidator.h
+++ b/components/invalidation/impl/non_blocking_invalidator.h
@@ -5,8 +5,8 @@
 // An implementation of SyncNotifier that wraps InvalidationNotifier
 // on its own thread.
 
-#ifndef COMPONENTS_INVALIDATION_NON_BLOCKING_INVALIDATOR_H_
-#define COMPONENTS_INVALIDATION_NON_BLOCKING_INVALIDATOR_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_NON_BLOCKING_INVALIDATOR_H_
+#define COMPONENTS_INVALIDATION_IMPL_NON_BLOCKING_INVALIDATOR_H_
 
 #include <string>
 
@@ -15,12 +15,12 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/invalidation_state_tracker.h"
-#include "components/invalidation/invalidator.h"
-#include "components/invalidation/invalidator_registrar.h"
-#include "components/invalidation/invalidator_state.h"
-#include "components/invalidation/unacked_invalidation_set.h"
+#include "components/invalidation/impl/invalidation_state_tracker.h"
+#include "components/invalidation/impl/invalidator.h"
+#include "components/invalidation/impl/invalidator_registrar.h"
+#include "components/invalidation/impl/unacked_invalidation_set.h"
+#include "components/invalidation/public/invalidation_export.h"
+#include "components/invalidation/public/invalidator_state.h"
 #include "jingle/notifier/base/notifier_options.h"
 
 namespace base {
@@ -109,4 +109,4 @@ class INVALIDATION_EXPORT_PRIVATE NonBlockingInvalidator
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_NON_BLOCKING_INVALIDATOR_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_NON_BLOCKING_INVALIDATOR_H_
diff --git a/components/invalidation/non_blocking_invalidator_unittest.cc b/components/invalidation/impl/non_blocking_invalidator_unittest.cc
index d1f2145..bf44d6b 100644
--- a/components/invalidation/non_blocking_invalidator_unittest.cc
+++ b/components/invalidation/impl/non_blocking_invalidator_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 "components/invalidation/non_blocking_invalidator.h"
+#include "components/invalidation/impl/non_blocking_invalidator.h"
 
 #include "base/bind_helpers.h"
 #include "base/location.h"
@@ -10,9 +10,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
-#include "components/invalidation/fake_invalidation_handler.h"
-#include "components/invalidation/invalidation_state_tracker.h"
-#include "components/invalidation/invalidator_test_template.h"
+#include "components/invalidation/impl/fake_invalidation_handler.h"
+#include "components/invalidation/impl/invalidation_state_tracker.h"
+#include "components/invalidation/impl/invalidator_test_template.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "jingle/notifier/base/fake_base_task.h"
 #include "net/url_request/url_request_test_util.h"
diff --git a/components/invalidation/notifier_reason_util.cc b/components/invalidation/impl/notifier_reason_util.cc
index 55469f4..0d98371 100644
--- a/components/invalidation/notifier_reason_util.cc
+++ b/components/invalidation/impl/notifier_reason_util.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 "components/invalidation/notifier_reason_util.h"
+#include "components/invalidation/impl/notifier_reason_util.h"
 
 #include "base/logging.h"
 
diff --git a/components/invalidation/notifier_reason_util.h b/components/invalidation/impl/notifier_reason_util.h
index 16025ba..9576b3c 100644
--- a/components/invalidation/notifier_reason_util.h
+++ b/components/invalidation/impl/notifier_reason_util.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_NOTIFIER_REASON_UTIL_H_
-#define COMPONENTS_INVALIDATION_NOTIFIER_REASON_UTIL_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_NOTIFIER_REASON_UTIL_H_
+#define COMPONENTS_INVALIDATION_IMPL_NOTIFIER_REASON_UTIL_H_
 
-#include "components/invalidation/invalidator_state.h"
+#include "components/invalidation/public/invalidator_state.h"
 #include "jingle/notifier/listener/push_client_observer.h"
 
 namespace syncer {
@@ -19,4 +19,4 @@ notifier::NotificationsDisabledReason
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_NOTIFIER_REASON_UTIL_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_NOTIFIER_REASON_UTIL_H_
diff --git a/components/invalidation/object_id_invalidation_map_test_util.cc b/components/invalidation/impl/object_id_invalidation_map_test_util.cc
index f52674f..dc85773 100644
--- a/components/invalidation/object_id_invalidation_map_test_util.cc
+++ b/components/invalidation/impl/object_id_invalidation_map_test_util.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 "components/invalidation/object_id_invalidation_map_test_util.h"
+#include "components/invalidation/impl/object_id_invalidation_map_test_util.h"
 
 #include <algorithm>
 
diff --git a/components/invalidation/object_id_invalidation_map_test_util.h b/components/invalidation/impl/object_id_invalidation_map_test_util.h
index 9be67a8..0dc4c5b 100644
--- a/components/invalidation/object_id_invalidation_map_test_util.h
+++ b/components/invalidation/impl/object_id_invalidation_map_test_util.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_
-#define COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_
+#define COMPONENTS_INVALIDATION_IMPL_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_
 
 // Convince googletest to use the correct overload for PrintTo().
-#include "components/invalidation/invalidation_test_util.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/impl/invalidation_test_util.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace syncer {
@@ -17,4 +17,4 @@ namespace syncer {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_
diff --git a/components/invalidation/object_id_invalidation_map_unittest.cc b/components/invalidation/impl/object_id_invalidation_map_unittest.cc
index 34b2e88..94fb86a 100644
--- a/components/invalidation/object_id_invalidation_map_unittest.cc
+++ b/components/invalidation/impl/object_id_invalidation_map_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 "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 
 #include "google/cacheinvalidation/types.pb.h"
 
diff --git a/components/invalidation/p2p_invalidation_service.cc b/components/invalidation/impl/p2p_invalidation_service.cc
index a528e9f..953f63f 100644
--- a/components/invalidation/p2p_invalidation_service.cc
+++ b/components/invalidation/impl/p2p_invalidation_service.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/p2p_invalidation_service.h"
+#include "components/invalidation/impl/p2p_invalidation_service.h"
 
 #include "base/command_line.h"
-#include "components/invalidation/invalidation_service_util.h"
-#include "components/invalidation/p2p_invalidator.h"
+#include "components/invalidation/impl/invalidation_service_util.h"
+#include "components/invalidation/impl/p2p_invalidator.h"
 #include "google_apis/gaia/identity_provider.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "jingle/notifier/listener/push_client.h"
diff --git a/components/invalidation/p2p_invalidation_service.h b/components/invalidation/impl/p2p_invalidation_service.h
index c0096e4..87ad3c4 100644
--- a/components/invalidation/p2p_invalidation_service.h
+++ b/components/invalidation/impl/p2p_invalidation_service.h
@@ -5,12 +5,12 @@
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/p2p_invalidator.h"
+#include "components/invalidation/impl/p2p_invalidator.h"
+#include "components/invalidation/public/invalidation_service.h"
 #include "components/keyed_service/core/keyed_service.h"
 
-#ifndef COMPONENTS_INVALIDATION_P2P_INVALIDATION_SERVICE_H_
-#define COMPONENTS_INVALIDATION_P2P_INVALIDATION_SERVICE_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_P2P_INVALIDATION_SERVICE_H_
+#define COMPONENTS_INVALIDATION_IMPL_P2P_INVALIDATION_SERVICE_H_
 
 namespace net {
 class URLRequestContextGetter;
@@ -66,4 +66,4 @@ class P2PInvalidationService : public base::NonThreadSafe,
 
 }  // namespace invalidation
 
-#endif  // COMPONENTS_INVALIDATION_P2P_INVALIDATION_SERVICE_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_P2P_INVALIDATION_SERVICE_H_
diff --git a/components/invalidation/p2p_invalidator.cc b/components/invalidation/impl/p2p_invalidator.cc
index aea1e3a..4f39cbd 100644
--- a/components/invalidation/p2p_invalidator.cc
+++ b/components/invalidation/impl/p2p_invalidator.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 "components/invalidation/p2p_invalidator.h"
+#include "components/invalidation/impl/p2p_invalidator.h"
 
 #include <algorithm>
 #include <iterator>
@@ -11,10 +11,10 @@
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/values.h"
-#include "components/invalidation/invalidation_handler.h"
-#include "components/invalidation/invalidation_util.h"
-#include "components/invalidation/notifier_reason_util.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/impl/notifier_reason_util.h"
+#include "components/invalidation/public/invalidation_handler.h"
+#include "components/invalidation/public/invalidation_util.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "jingle/notifier/listener/push_client.h"
 
 namespace syncer {
diff --git a/components/invalidation/p2p_invalidator.h b/components/invalidation/impl/p2p_invalidator.h
index b34c4a9..b7bc462 100644
--- a/components/invalidation/p2p_invalidator.h
+++ b/components/invalidation/impl/p2p_invalidator.h
@@ -5,8 +5,8 @@
 // An invalidator that uses p2p invalidations based on XMPP push
 // notifications.  Used only for sync integration tests.
 
-#ifndef COMPONENTS_INVALIDATION_P2P_INVALIDATOR_H_
-#define COMPONENTS_INVALIDATION_P2P_INVALIDATOR_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_P2P_INVALIDATOR_H_
+#define COMPONENTS_INVALIDATION_IMPL_P2P_INVALIDATOR_H_
 
 #include <string>
 
@@ -16,11 +16,11 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/invalidator.h"
-#include "components/invalidation/invalidator_registrar.h"
-#include "components/invalidation/invalidator_state.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/impl/invalidator.h"
+#include "components/invalidation/impl/invalidator_registrar.h"
+#include "components/invalidation/public/invalidation_export.h"
+#include "components/invalidation/public/invalidator_state.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "jingle/notifier/listener/push_client.h"
 #include "jingle/notifier/listener/push_client_observer.h"
@@ -145,4 +145,4 @@ class INVALIDATION_EXPORT_PRIVATE P2PInvalidator
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_P2P_INVALIDATOR_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_P2P_INVALIDATOR_H_
diff --git a/components/invalidation/p2p_invalidator_unittest.cc b/components/invalidation/impl/p2p_invalidator_unittest.cc
index 2065deb..95128f3 100644
--- a/components/invalidation/p2p_invalidator_unittest.cc
+++ b/components/invalidation/impl/p2p_invalidator_unittest.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/p2p_invalidator.h"
+#include "components/invalidation/impl/p2p_invalidator.h"
 
 #include <cstddef>
 
-#include "components/invalidation/fake_invalidation_handler.h"
-#include "components/invalidation/invalidator_state.h"
-#include "components/invalidation/invalidator_test_template.h"
-#include "components/invalidation/notifier_reason_util.h"
+#include "components/invalidation/impl/fake_invalidation_handler.h"
+#include "components/invalidation/impl/invalidator_test_template.h"
+#include "components/invalidation/impl/notifier_reason_util.h"
+#include "components/invalidation/public/invalidator_state.h"
 #include "jingle/notifier/listener/fake_push_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/invalidation/profile_invalidation_provider.cc b/components/invalidation/impl/profile_invalidation_provider.cc
index ed7c44b..2559c3be8 100644
--- a/components/invalidation/profile_invalidation_provider.cc
+++ b/components/invalidation/impl/profile_invalidation_provider.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/profile_invalidation_provider.h"
+#include "components/invalidation/impl/profile_invalidation_provider.h"
 
-#include "components/invalidation/invalidation_service.h"
+#include "components/invalidation/public/invalidation_service.h"
 
 namespace invalidation {
 
diff --git a/components/invalidation/profile_invalidation_provider.h b/components/invalidation/impl/profile_invalidation_provider.h
index 8277926..7f4f9e5 100644
--- a/components/invalidation/profile_invalidation_provider.h
+++ b/components/invalidation/impl/profile_invalidation_provider.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_PROFILE_INVALIDATION_PROVIDER_H_
-#define COMPONENTS_INVALIDATION_PROFILE_INVALIDATION_PROVIDER_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_PROFILE_INVALIDATION_PROVIDER_H_
+#define COMPONENTS_INVALIDATION_IMPL_PROFILE_INVALIDATION_PROVIDER_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ -34,4 +34,4 @@ class ProfileInvalidationProvider : public KeyedService {
 
 }  // namespace invalidation
 
-#endif  // COMPONENTS_INVALIDATION_PROFILE_INVALIDATION_PROVIDER_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_PROFILE_INVALIDATION_PROVIDER_H_
diff --git a/components/invalidation/push_client_channel.cc b/components/invalidation/impl/push_client_channel.cc
index 022993e..5541604 100644
--- a/components/invalidation/push_client_channel.cc
+++ b/components/invalidation/impl/push_client_channel.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/push_client_channel.h"
+#include "components/invalidation/impl/push_client_channel.h"
 
 #include "base/stl_util.h"
-#include "components/invalidation/notifier_reason_util.h"
+#include "components/invalidation/impl/notifier_reason_util.h"
 #include "google/cacheinvalidation/client_gateway.pb.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "jingle/notifier/listener/push_client.h"
diff --git a/components/invalidation/push_client_channel.h b/components/invalidation/impl/push_client_channel.h
index 51b0954..85a2fd3 100644
--- a/components/invalidation/push_client_channel.h
+++ b/components/invalidation/impl/push_client_channel.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_PUSH_CLIENT_CHANNEL_H_
-#define COMPONENTS_INVALIDATION_PUSH_CLIENT_CHANNEL_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_PUSH_CLIENT_CHANNEL_H_
+#define COMPONENTS_INVALIDATION_IMPL_PUSH_CLIENT_CHANNEL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/sync_system_resources.h"
+#include "components/invalidation/impl/sync_system_resources.h"
+#include "components/invalidation/public/invalidation_export.h"
 #include "jingle/notifier/listener/push_client_observer.h"
 
 namespace notifier {
@@ -88,4 +88,4 @@ class INVALIDATION_EXPORT_PRIVATE PushClientChannel
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_PUSH_CLIENT_CHANNEL_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_PUSH_CLIENT_CHANNEL_H_
diff --git a/components/invalidation/push_client_channel_unittest.cc b/components/invalidation/impl/push_client_channel_unittest.cc
index 3e2104d..8fd5372 100644
--- a/components/invalidation/push_client_channel_unittest.cc
+++ b/components/invalidation/impl/push_client_channel_unittest.cc
@@ -5,7 +5,7 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "components/invalidation/push_client_channel.h"
+#include "components/invalidation/impl/push_client_channel.h"
 #include "jingle/notifier/listener/fake_push_client.h"
 #include "jingle/notifier/listener/notification_defines.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/invalidation/registration_manager.cc b/components/invalidation/impl/registration_manager.cc
index f0a1f93..1a283482 100644
--- a/components/invalidation/registration_manager.cc
+++ b/components/invalidation/impl/registration_manager.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 "components/invalidation/registration_manager.h"
+#include "components/invalidation/impl/registration_manager.h"
 
 #include <algorithm>
 #include <cstddef>
@@ -12,7 +12,7 @@
 
 #include "base/rand_util.h"
 #include "base/stl_util.h"
-#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/public/invalidation_util.h"
 #include "google/cacheinvalidation/include/invalidation-client.h"
 #include "google/cacheinvalidation/include/types.h"
 
diff --git a/components/invalidation/registration_manager.h b/components/invalidation/impl/registration_manager.h
index 00eb48e..b48c07f 100644
--- a/components/invalidation/registration_manager.h
+++ b/components/invalidation/impl/registration_manager.h
@@ -5,8 +5,8 @@
 // A class that manages the registration of types for server-issued
 // notifications.
 
-#ifndef COMPONENTS_INVALIDATION_REGISTRATION_MANAGER_H_
-#define COMPONENTS_INVALIDATION_REGISTRATION_MANAGER_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_REGISTRATION_MANAGER_H_
+#define COMPONENTS_INVALIDATION_IMPL_REGISTRATION_MANAGER_H_
 
 #include <map>
 
@@ -15,8 +15,8 @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 // For invalidation::InvalidationListener::RegistrationState.
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/public/invalidation_export.h"
+#include "components/invalidation/public/invalidation_util.h"
 #include "google/cacheinvalidation/include/invalidation-listener.h"
 #include "google/cacheinvalidation/include/types.h"
 
@@ -185,4 +185,4 @@ class INVALIDATION_EXPORT_PRIVATE RegistrationManager
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_REGISTRATION_MANAGER_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_REGISTRATION_MANAGER_H_
diff --git a/components/invalidation/registration_manager_unittest.cc b/components/invalidation/impl/registration_manager_unittest.cc
index b98de58..42645f8 100644
--- a/components/invalidation/registration_manager_unittest.cc
+++ b/components/invalidation/impl/registration_manager_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 "components/invalidation/registration_manager.h"
+#include "components/invalidation/impl/registration_manager.h"
 
 #include <algorithm>
 #include <cmath>
@@ -13,7 +13,7 @@
 #include "base/basictypes.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
-#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/public/invalidation_util.h"
 #include "google/cacheinvalidation/include/invalidation-client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/invalidation/single_object_invalidation_set_unittest.cc b/components/invalidation/impl/single_object_invalidation_set_unittest.cc
index aae71d0..102fb73 100644
--- a/components/invalidation/single_object_invalidation_set_unittest.cc
+++ b/components/invalidation/impl/single_object_invalidation_set_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/single_object_invalidation_set.h"
+#include "components/invalidation/public/single_object_invalidation_set.h"
 
-#include "components/invalidation/invalidation_test_util.h"
+#include "components/invalidation/impl/invalidation_test_util.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/invalidation/state_writer.h b/components/invalidation/impl/state_writer.h
index 4710e7c..cb02c41 100644
--- a/components/invalidation/state_writer.h
+++ b/components/invalidation/impl/state_writer.h
@@ -4,12 +4,12 @@
 //
 // Simple interface for something that persists state.
 
-#ifndef COMPONENTS_INVALIDATION_STATE_WRITER_H_
-#define COMPONENTS_INVALIDATION_STATE_WRITER_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_STATE_WRITER_H_
+#define COMPONENTS_INVALIDATION_IMPL_STATE_WRITER_H_
 
 #include <string>
 
-#include "components/invalidation/invalidation_export.h"
+#include "components/invalidation/public/invalidation_export.h"
 
 namespace syncer {
 
@@ -22,4 +22,4 @@ class INVALIDATION_EXPORT_PRIVATE StateWriter {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_STATE_WRITER_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_STATE_WRITER_H_
diff --git a/components/invalidation/sync_invalidation_listener.cc b/components/invalidation/impl/sync_invalidation_listener.cc
index d7dd8f4..14243c9 100644
--- a/components/invalidation/sync_invalidation_listener.cc
+++ b/components/invalidation/impl/sync_invalidation_listener.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 "components/invalidation/sync_invalidation_listener.h"
+#include "components/invalidation/impl/sync_invalidation_listener.h"
 
 #include <vector>
 
@@ -14,9 +14,9 @@
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/tracked_objects.h"
-#include "components/invalidation/invalidation_util.h"
-#include "components/invalidation/object_id_invalidation_map.h"
-#include "components/invalidation/registration_manager.h"
+#include "components/invalidation/impl/registration_manager.h"
+#include "components/invalidation/public/invalidation_util.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "google/cacheinvalidation/include/invalidation-client.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "jingle/notifier/listener/push_client.h"
diff --git a/components/invalidation/sync_invalidation_listener.h b/components/invalidation/impl/sync_invalidation_listener.h
index 37fa7f1..697c1a7 100644
--- a/components/invalidation/sync_invalidation_listener.h
+++ b/components/invalidation/impl/sync_invalidation_listener.h
@@ -5,8 +5,8 @@
 // A simple wrapper around invalidation::InvalidationClient that
 // handles all the startup/shutdown details and hookups.
 
-#ifndef COMPONENTS_INVALIDATION_SYNC_INVALIDATION_LISTENER_H_
-#define COMPONENTS_INVALIDATION_SYNC_INVALIDATION_LISTENER_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_SYNC_INVALIDATION_LISTENER_H_
+#define COMPONENTS_INVALIDATION_IMPL_SYNC_INVALIDATION_LISTENER_H_
 
 #include <string>
 
@@ -16,13 +16,13 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
-#include "components/invalidation/ack_handler.h"
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/invalidation_state_tracker.h"
-#include "components/invalidation/invalidator_state.h"
-#include "components/invalidation/state_writer.h"
-#include "components/invalidation/sync_system_resources.h"
-#include "components/invalidation/unacked_invalidation_set.h"
+#include "components/invalidation/impl/invalidation_state_tracker.h"
+#include "components/invalidation/impl/state_writer.h"
+#include "components/invalidation/impl/sync_system_resources.h"
+#include "components/invalidation/impl/unacked_invalidation_set.h"
+#include "components/invalidation/public/ack_handler.h"
+#include "components/invalidation/public/invalidation_export.h"
+#include "components/invalidation/public/invalidator_state.h"
 #include "google/cacheinvalidation/include/invalidation-listener.h"
 
 namespace buzz {
@@ -189,4 +189,4 @@ class INVALIDATION_EXPORT_PRIVATE SyncInvalidationListener
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_SYNC_INVALIDATION_LISTENER_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_SYNC_INVALIDATION_LISTENER_H_
diff --git a/components/invalidation/sync_invalidation_listener_unittest.cc b/components/invalidation/impl/sync_invalidation_listener_unittest.cc
index 8fd0e2b..f5b51d9 100644
--- a/components/invalidation/sync_invalidation_listener_unittest.cc
+++ b/components/invalidation/impl/sync_invalidation_listener_unittest.cc
@@ -12,12 +12,12 @@
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/thread_task_runner_handle.h"
-#include "components/invalidation/fake_invalidation_state_tracker.h"
-#include "components/invalidation/invalidation_util.h"
-#include "components/invalidation/object_id_invalidation_map.h"
-#include "components/invalidation/push_client_channel.h"
-#include "components/invalidation/sync_invalidation_listener.h"
-#include "components/invalidation/unacked_invalidation_set_test_util.h"
+#include "components/invalidation/impl/fake_invalidation_state_tracker.h"
+#include "components/invalidation/impl/push_client_channel.h"
+#include "components/invalidation/impl/sync_invalidation_listener.h"
+#include "components/invalidation/impl/unacked_invalidation_set_test_util.h"
+#include "components/invalidation/public/invalidation_util.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "google/cacheinvalidation/include/invalidation-client.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "jingle/notifier/listener/fake_push_client.h"
diff --git a/components/invalidation/sync_system_resources.cc b/components/invalidation/impl/sync_system_resources.cc
index 3005700..52fbda8 100644
--- a/components/invalidation/sync_system_resources.cc
+++ b/components/invalidation/impl/sync_system_resources.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 "components/invalidation/sync_system_resources.h"
+#include "components/invalidation/impl/sync_system_resources.h"
 
 #include <cstdlib>
 #include <cstring>
@@ -16,10 +16,10 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
-#include "components/invalidation/gcm_network_channel.h"
-#include "components/invalidation/gcm_network_channel_delegate.h"
-#include "components/invalidation/invalidation_util.h"
-#include "components/invalidation/push_client_channel.h"
+#include "components/invalidation/impl/gcm_network_channel.h"
+#include "components/invalidation/impl/gcm_network_channel_delegate.h"
+#include "components/invalidation/impl/push_client_channel.h"
+#include "components/invalidation/public/invalidation_util.h"
 #include "google/cacheinvalidation/deps/callback.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "jingle/notifier/listener/push_client.h"
diff --git a/components/invalidation/sync_system_resources.h b/components/invalidation/impl/sync_system_resources.h
index 7e707e7..5a6e8c9 100644
--- a/components/invalidation/sync_system_resources.h
+++ b/components/invalidation/impl/sync_system_resources.h
@@ -6,8 +6,8 @@
 // for scheduling.  Assumes the current message loop is already
 // running.
 
-#ifndef COMPONENTS_INVALIDATION_SYNC_SYSTEM_RESOURCES_H_
-#define COMPONENTS_INVALIDATION_SYNC_SYSTEM_RESOURCES_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_SYNC_SYSTEM_RESOURCES_H_
+#define COMPONENTS_INVALIDATION_IMPL_SYNC_SYSTEM_RESOURCES_H_
 
 #include <set>
 #include <string>
@@ -19,9 +19,9 @@
 #include "base/message_loop/message_loop.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/values.h"
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/invalidator_state.h"
-#include "components/invalidation/state_writer.h"
+#include "components/invalidation/impl/state_writer.h"
+#include "components/invalidation/public/invalidation_export.h"
+#include "components/invalidation/public/invalidator_state.h"
 #include "google/cacheinvalidation/include/system-resources.h"
 #include "jingle/notifier/base/notifier_options.h"
 
@@ -246,4 +246,4 @@ class INVALIDATION_EXPORT_PRIVATE SyncSystemResources
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_SYNC_SYSTEM_RESOURCES_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_SYNC_SYSTEM_RESOURCES_H_
diff --git a/components/invalidation/sync_system_resources_unittest.cc b/components/invalidation/impl/sync_system_resources_unittest.cc
index 3501f1e..e337ccb 100644
--- a/components/invalidation/sync_system_resources_unittest.cc
+++ b/components/invalidation/impl/sync_system_resources_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 "components/invalidation/sync_system_resources.h"
+#include "components/invalidation/impl/sync_system_resources.h"
 
 #include <string>
 
@@ -11,8 +11,8 @@
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
 
-#include "components/invalidation/push_client_channel.h"
-#include "components/invalidation/state_writer.h"
+#include "components/invalidation/impl/push_client_channel.h"
+#include "components/invalidation/impl/state_writer.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "jingle/notifier/listener/fake_push_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/components/invalidation/ticl_invalidation_service.cc b/components/invalidation/impl/ticl_invalidation_service.cc
index 1d3b594..d8371e8 100644
--- a/components/invalidation/ticl_invalidation_service.cc
+++ b/components/invalidation/impl/ticl_invalidation_service.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/ticl_invalidation_service.h"
+#include "components/invalidation/impl/ticl_invalidation_service.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
 #include "components/gcm_driver/gcm_driver.h"
-#include "components/invalidation/gcm_invalidation_bridge.h"
-#include "components/invalidation/invalidation_service_util.h"
-#include "components/invalidation/invalidation_util.h"
-#include "components/invalidation/invalidator.h"
-#include "components/invalidation/invalidator_state.h"
-#include "components/invalidation/non_blocking_invalidator.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/impl/gcm_invalidation_bridge.h"
+#include "components/invalidation/impl/invalidation_service_util.h"
+#include "components/invalidation/impl/invalidator.h"
+#include "components/invalidation/impl/non_blocking_invalidator.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 "google_apis/gaia/gaia_constants.h"
 #include "net/url_request/url_request_context_getter.h"
 
diff --git a/components/invalidation/ticl_invalidation_service.h b/components/invalidation/impl/ticl_invalidation_service.h
index 4019c19..3ab3f33 100644
--- a/components/invalidation/ticl_invalidation_service.h
+++ b/components/invalidation/impl/ticl_invalidation_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_TICL_INVALIDATION_SERVICE_H_
-#define COMPONENTS_INVALIDATION_TICL_INVALIDATION_SERVICE_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_TICL_INVALIDATION_SERVICE_H_
+#define COMPONENTS_INVALIDATION_IMPL_TICL_INVALIDATION_SERVICE_H_
 
 #include <string>
 
@@ -14,11 +14,11 @@
 #include "base/threading/non_thread_safe.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
-#include "components/invalidation/invalidation_handler.h"
-#include "components/invalidation/invalidation_logger.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/invalidator_registrar.h"
-#include "components/invalidation/ticl_settings_provider.h"
+#include "components/invalidation/impl/invalidation_logger.h"
+#include "components/invalidation/impl/invalidator_registrar.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/keyed_service/core/keyed_service.h"
 #include "google_apis/gaia/identity_provider.h"
 #include "google_apis/gaia/oauth2_token_service.h"
@@ -165,4 +165,4 @@ class TiclInvalidationService : public base::NonThreadSafe,
 
 }  // namespace invalidation
 
-#endif  // COMPONENTS_INVALIDATION_TICL_INVALIDATION_SERVICE_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_TICL_INVALIDATION_SERVICE_H_
diff --git a/components/invalidation/ticl_invalidation_service_unittest.cc b/components/invalidation/impl/ticl_invalidation_service_unittest.cc
index fe2a995..29df95d 100644
--- a/components/invalidation/ticl_invalidation_service_unittest.cc
+++ b/components/invalidation/impl/ticl_invalidation_service_unittest.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/ticl_invalidation_service.h"
+#include "components/invalidation/impl/ticl_invalidation_service.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "components/gcm_driver/fake_gcm_driver.h"
 #include "components/gcm_driver/gcm_driver.h"
-#include "components/invalidation/fake_invalidation_state_tracker.h"
-#include "components/invalidation/fake_invalidator.h"
-#include "components/invalidation/gcm_invalidation_bridge.h"
-#include "components/invalidation/invalidation_service_test_template.h"
-#include "components/invalidation/invalidation_state_tracker.h"
-#include "components/invalidation/invalidator.h"
+#include "components/invalidation/impl/fake_invalidation_state_tracker.h"
+#include "components/invalidation/impl/fake_invalidator.h"
+#include "components/invalidation/impl/gcm_invalidation_bridge.h"
+#include "components/invalidation/impl/invalidation_service_test_template.h"
+#include "components/invalidation/impl/invalidation_state_tracker.h"
+#include "components/invalidation/impl/invalidator.h"
 #include "google_apis/gaia/fake_identity_provider.h"
 #include "google_apis/gaia/fake_oauth2_token_service.h"
 #include "net/url_request/url_request_context_getter.h"
diff --git a/components/invalidation/ticl_settings_provider.cc b/components/invalidation/impl/ticl_settings_provider.cc
index dfe5dd0..6c9c632 100644
--- a/components/invalidation/ticl_settings_provider.cc
+++ b/components/invalidation/impl/ticl_settings_provider.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 "components/invalidation/ticl_settings_provider.h"
+#include "components/invalidation/impl/ticl_settings_provider.h"
 
 namespace invalidation {
 
diff --git a/components/invalidation/ticl_settings_provider.h b/components/invalidation/impl/ticl_settings_provider.h
index 72f495c..a768390 100644
--- a/components/invalidation/ticl_settings_provider.h
+++ b/components/invalidation/impl/ticl_settings_provider.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_TICL_SETTINGS_PROVIDER_H_
-#define COMPONENTS_INVALIDATION_TICL_SETTINGS_PROVIDER_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_TICL_SETTINGS_PROVIDER_H_
+#define COMPONENTS_INVALIDATION_IMPL_TICL_SETTINGS_PROVIDER_H_
 
 #include "base/macros.h"
 #include "base/observer_list.h"
@@ -41,4 +41,4 @@ class TiclSettingsProvider {
 
 }  // namespace invalidation
 
-#endif  // COMPONENTS_INVALIDATION_TICL_SETTINGS_PROVIDER_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_TICL_SETTINGS_PROVIDER_H_
diff --git a/components/invalidation/unacked_invalidation_set.cc b/components/invalidation/impl/unacked_invalidation_set.cc
index 9519f33..1011291 100644
--- a/components/invalidation/unacked_invalidation_set.cc
+++ b/components/invalidation/impl/unacked_invalidation_set.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/unacked_invalidation_set.h"
+#include "components/invalidation/impl/unacked_invalidation_set.h"
 
 #include "base/strings/string_number_conversions.h"
-#include "components/invalidation/ack_handle.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/public/ack_handle.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 
 namespace {
 
diff --git a/components/invalidation/unacked_invalidation_set.h b/components/invalidation/impl/unacked_invalidation_set.h
index ac9b2c3..62ab0b2 100644
--- a/components/invalidation/unacked_invalidation_set.h
+++ b/components/invalidation/impl/unacked_invalidation_set.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_
-#define COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_UNACKED_INVALIDATION_SET_H_
+#define COMPONENTS_INVALIDATION_IMPL_UNACKED_INVALIDATION_SET_H_
 
 #include <set>
 
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
-#include "components/invalidation/invalidation.h"
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/public/invalidation.h"
+#include "components/invalidation/public/invalidation_export.h"
+#include "components/invalidation/public/invalidation_util.h"
 
 namespace base {
 class DictionaryValue;
@@ -118,4 +118,4 @@ typedef std::map<invalidation::ObjectId,
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_UNACKED_INVALIDATION_SET_H_
diff --git a/components/invalidation/unacked_invalidation_set_test_util.cc b/components/invalidation/impl/unacked_invalidation_set_test_util.cc
index 165df6e..7201e75 100644
--- a/components/invalidation/unacked_invalidation_set_test_util.cc
+++ b/components/invalidation/impl/unacked_invalidation_set_test_util.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/unacked_invalidation_set_test_util.h"
+#include "components/invalidation/impl/unacked_invalidation_set_test_util.h"
 
 #include "base/json/json_string_value_serializer.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "testing/gmock/include/gmock/gmock-matchers.h"
 
 namespace syncer {
diff --git a/components/invalidation/unacked_invalidation_set_test_util.h b/components/invalidation/impl/unacked_invalidation_set_test_util.h
index 4adbb56..8684d697 100644
--- a/components/invalidation/unacked_invalidation_set_test_util.h
+++ b/components/invalidation/impl/unacked_invalidation_set_test_util.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_TEST_UTIL_H_
-#define COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_TEST_UTIL_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_UNACKED_INVALIDATION_SET_TEST_UTIL_H_
+#define COMPONENTS_INVALIDATION_IMPL_UNACKED_INVALIDATION_SET_TEST_UTIL_H_
 
-#include "components/invalidation/unacked_invalidation_set.h"
+#include "components/invalidation/impl/unacked_invalidation_set.h"
 
 #include "testing/gmock/include/gmock/gmock-matchers.h"
 
@@ -27,4 +27,4 @@ void PrintTo(const UnackedInvalidationsMap& map, ::std::ostream* os);
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_TEST_UTIL_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_UNACKED_INVALIDATION_SET_TEST_UTIL_H_
diff --git a/components/invalidation/unacked_invalidation_set_unittest.cc b/components/invalidation/impl/unacked_invalidation_set_unittest.cc
index 51bdbcd..6916bc1 100644
--- a/components/invalidation/unacked_invalidation_set_unittest.cc
+++ b/components/invalidation/impl/unacked_invalidation_set_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/unacked_invalidation_set.h"
+#include "components/invalidation/impl/unacked_invalidation_set.h"
 
 #include "base/json/json_string_value_serializer.h"
-#include "components/invalidation/object_id_invalidation_map.h"
-#include "components/invalidation/single_object_invalidation_set.h"
-#include "components/invalidation/unacked_invalidation_set_test_util.h"
+#include "components/invalidation/impl/unacked_invalidation_set_test_util.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
+#include "components/invalidation/public/single_object_invalidation_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
diff --git a/components/invalidation/public/BUILD.gn b/components/invalidation/public/BUILD.gn
new file mode 100644
index 0000000..8cee314
--- /dev/null
+++ b/components/invalidation/public/BUILD.gn
@@ -0,0 +1,32 @@
+# 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.
+
+static_library("public") {
+  sources = [
+    "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",
+  ]
+  public_deps = [
+    "//third_party/cacheinvalidation",
+  ]
+  deps = [
+    "//base",
+  ]
+}
diff --git a/components/invalidation/ack_handle.cc b/components/invalidation/public/ack_handle.cc
index ee0e8b6..90e4572 100644
--- a/components/invalidation/ack_handle.cc
+++ b/components/invalidation/public/ack_handle.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 "components/invalidation/ack_handle.h"
+#include "components/invalidation/public/ack_handle.h"
 
 #include <cstddef>
 #include "base/rand_util.h"
diff --git a/components/invalidation/ack_handle.h b/components/invalidation/public/ack_handle.h
index 2435efa..b40e94d 100644
--- a/components/invalidation/ack_handle.h
+++ b/components/invalidation/public/ack_handle.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_ACK_HANDLE_H_
-#define COMPONENTS_INVALIDATION_ACK_HANDLE_H_
+#ifndef COMPONENTS_INVALIDATION_PUBLIC_ACK_HANDLE_H_
+#define COMPONENTS_INVALIDATION_PUBLIC_ACK_HANDLE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
-#include "components/invalidation/invalidation_export.h"
+#include "components/invalidation/public/invalidation_export.h"
 
 namespace base {
 class DictionaryValue;
@@ -44,4 +44,4 @@ class INVALIDATION_EXPORT AckHandle {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_ACK_HANDLE_H_
+#endif  // COMPONENTS_INVALIDATION_PUBLIC_ACK_HANDLE_H_
diff --git a/components/invalidation/ack_handler.cc b/components/invalidation/public/ack_handler.cc
index 68dc028..0a83a94 100644
--- a/components/invalidation/ack_handler.cc
+++ b/components/invalidation/public/ack_handler.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/ack_handler.h"
+#include "components/invalidation/public/ack_handler.h"
 
-#include "components/invalidation/invalidation.h"
+#include "components/invalidation/public/invalidation.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/ack_handler.h b/components/invalidation/public/ack_handler.h
index 0a2f642..b559ea1 100644
--- a/components/invalidation/ack_handler.h
+++ b/components/invalidation/public/ack_handler.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_ACK_HANDLER_H_
-#define COMPONENTS_INVALIDATION_ACK_HANDLER_H_
+#ifndef COMPONENTS_INVALIDATION_PUBLIC_ACK_HANDLER_H_
+#define COMPONENTS_INVALIDATION_PUBLIC_ACK_HANDLER_H_
 
 #include <vector>
 
-#include "components/invalidation/invalidation_export.h"
+#include "components/invalidation/public/invalidation_export.h"
 
 namespace invalidation {
 class ObjectId;
@@ -37,4 +37,4 @@ class INVALIDATION_EXPORT AckHandler {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_ACK_HANDLER_H_
+#endif  // COMPONENTS_INVALIDATION_PUBLIC_ACK_HANDLER_H_
diff --git a/components/invalidation/invalidation.cc b/components/invalidation/public/invalidation.cc
index 8b04e3f..26cdb61 100644
--- a/components/invalidation/invalidation.cc
+++ b/components/invalidation/public/invalidation.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 "components/invalidation/invalidation.h"
+#include "components/invalidation/public/invalidation.h"
 
 #include <cstddef>
 
@@ -12,8 +12,8 @@
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
-#include "components/invalidation/ack_handler.h"
-#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/public/ack_handler.h"
+#include "components/invalidation/public/invalidation_util.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/invalidation.h b/components/invalidation/public/invalidation.h
index ccc1b19..3a44f19 100644
--- a/components/invalidation/invalidation.h
+++ b/components/invalidation/public/invalidation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATION_H_
-#define COMPONENTS_INVALIDATION_INVALIDATION_H_
+#ifndef COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_H_
+#define COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_H_
 
 #include <string>
 
@@ -12,8 +12,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner.h"
 #include "base/values.h"
-#include "components/invalidation/ack_handle.h"
-#include "components/invalidation/invalidation_export.h"
+#include "components/invalidation/public/ack_handle.h"
+#include "components/invalidation/public/invalidation_export.h"
 #include "google/cacheinvalidation/include/types.h"
 
 namespace syncer {
@@ -124,4 +124,4 @@ class INVALIDATION_EXPORT Invalidation {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATION_H_
+#endif  // COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_H_
diff --git a/components/invalidation/invalidation_export.h b/components/invalidation/public/invalidation_export.h
index 08683be..f41a06b 100644
--- a/components/invalidation/invalidation_export.h
+++ b/components/invalidation/public/invalidation_export.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATION_EXPORT_H_
-#define COMPONENTS_INVALIDATION_INVALIDATION_EXPORT_H_
+#ifndef COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_EXPORT_H_
+#define COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_EXPORT_H_
 
 // The files under components/invalidation do not currently support a shared
 // library build.  There's no point in attaching attributes to them.
@@ -18,4 +18,4 @@
 #define INVALIDATION_EXPORT
 #define INVALIDATION_EXPORT_PRIVATE
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATION_EXPORT_H_
+#endif  // COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_EXPORT_H_
diff --git a/components/invalidation/invalidation_handler.cc b/components/invalidation/public/invalidation_handler.cc
index bdc4b8f..0a75e53 100644
--- a/components/invalidation/invalidation_handler.cc
+++ b/components/invalidation/public/invalidation_handler.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 "components/invalidation/invalidation_handler.h"
+#include "components/invalidation/public/invalidation_handler.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/invalidation_handler.h b/components/invalidation/public/invalidation_handler.h
index 665406d..60cd1cb 100644
--- a/components/invalidation/invalidation_handler.h
+++ b/components/invalidation/public/invalidation_handler.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATION_HANDLER_H_
-#define COMPONENTS_INVALIDATION_INVALIDATION_HANDLER_H_
+#ifndef COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_HANDLER_H_
+#define COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_HANDLER_H_
 
 #include <string>
 
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/invalidator_state.h"
+#include "components/invalidation/public/invalidation_export.h"
+#include "components/invalidation/public/invalidator_state.h"
 
 namespace syncer {
 
@@ -35,4 +35,4 @@ class INVALIDATION_EXPORT InvalidationHandler {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATION_HANDLER_H_
+#endif  // COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_HANDLER_H_
diff --git a/components/invalidation/invalidation_service.h b/components/invalidation/public/invalidation_service.h
index 116694d..fade08f 100644
--- a/components/invalidation/invalidation_service.h
+++ b/components/invalidation/public/invalidation_service.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_H_
-#define COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_H_
+#ifndef COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_SERVICE_H_
+#define COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_SERVICE_H_
 
 #include "base/callback_forward.h"
-#include "components/invalidation/invalidation_util.h"
-#include "components/invalidation/invalidator_state.h"
+#include "components/invalidation/public/invalidation_util.h"
+#include "components/invalidation/public/invalidator_state.h"
 
 class IdentityProvider;
 
@@ -113,4 +113,4 @@ class InvalidationService {
 
 }  // namespace invalidation
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_H_
+#endif  // COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_SERVICE_H_
diff --git a/components/invalidation/invalidation_util.cc b/components/invalidation/public/invalidation_util.cc
index d3706f4..0c5ac15 100644
--- a/components/invalidation/invalidation_util.cc
+++ b/components/invalidation/public/invalidation_util.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 "components/invalidation/invalidation_util.h"
+#include "components/invalidation/public/invalidation_util.h"
 
 #include <ostream>
 #include <sstream>
@@ -10,7 +10,7 @@
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
-#include "components/invalidation/invalidation.h"
+#include "components/invalidation/public/invalidation.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/types.pb.h"
 
diff --git a/components/invalidation/invalidation_util.h b/components/invalidation/public/invalidation_util.h
index b5b21b6..857bad6 100644
--- a/components/invalidation/invalidation_util.h
+++ b/components/invalidation/public/invalidation_util.h
@@ -4,15 +4,15 @@
 //
 // Various utilities for dealing with invalidation data types.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATION_UTIL_H_
-#define COMPONENTS_INVALIDATION_INVALIDATION_UTIL_H_
+#ifndef COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_UTIL_H_
+#define COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_UTIL_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "components/invalidation/invalidation_export.h"
+#include "components/invalidation/public/invalidation_export.h"
 
 namespace base {
 class DictionaryValue;
@@ -54,4 +54,4 @@ INVALIDATION_EXPORT std::string ObjectIdToString(
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATION_UTIL_H_
+#endif  // COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_UTIL_H_
diff --git a/components/invalidation/invalidator_state.cc b/components/invalidation/public/invalidator_state.cc
index 1ad3c45..d7f7e39 100644
--- a/components/invalidation/invalidator_state.cc
+++ b/components/invalidation/public/invalidator_state.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 "components/invalidation/invalidator_state.h"
+#include "components/invalidation/public/invalidator_state.h"
 
 #include "base/logging.h"
 
diff --git a/components/invalidation/invalidator_state.h b/components/invalidation/public/invalidator_state.h
index cee5bd8..ca99a18 100644
--- a/components/invalidation/invalidator_state.h
+++ b/components/invalidation/public/invalidator_state.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_INVALIDATOR_STATE_H_
-#define COMPONENTS_INVALIDATION_INVALIDATOR_STATE_H_
+#ifndef COMPONENTS_INVALIDATION_PUBLIC_INVALIDATOR_STATE_H_
+#define COMPONENTS_INVALIDATION_PUBLIC_INVALIDATOR_STATE_H_
 
-#include "components/invalidation/invalidation_export.h"
+#include "components/invalidation/public/invalidation_export.h"
 
 namespace syncer {
 
@@ -28,4 +28,4 @@ INVALIDATION_EXPORT const char* InvalidatorStateToString(
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATOR_STATE_H_
+#endif  // COMPONENTS_INVALIDATION_PUBLIC_INVALIDATOR_STATE_H_
diff --git a/components/invalidation/object_id_invalidation_map.cc b/components/invalidation/public/object_id_invalidation_map.cc
index 139e8d5..f2e22ac 100644
--- a/components/invalidation/object_id_invalidation_map.cc
+++ b/components/invalidation/public/object_id_invalidation_map.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 "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 
 #include "base/json/json_string_value_serializer.h"
 
diff --git a/components/invalidation/object_id_invalidation_map.h b/components/invalidation/public/object_id_invalidation_map.h
index ac37d30..c2f86de 100644
--- a/components/invalidation/object_id_invalidation_map.h
+++ b/components/invalidation/public/object_id_invalidation_map.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_H_
-#define COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_H_
+#ifndef COMPONENTS_INVALIDATION_PUBLIC_OBJECT_ID_INVALIDATION_MAP_H_
+#define COMPONENTS_INVALIDATION_PUBLIC_OBJECT_ID_INVALIDATION_MAP_H_
 
 #include <map>
 #include <vector>
 
-#include "components/invalidation/invalidation.h"
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/invalidation_util.h"
-#include "components/invalidation/single_object_invalidation_set.h"
+#include "components/invalidation/public/invalidation.h"
+#include "components/invalidation/public/invalidation_export.h"
+#include "components/invalidation/public/invalidation_util.h"
+#include "components/invalidation/public/single_object_invalidation_set.h"
 
 namespace syncer {
 
@@ -73,4 +73,4 @@ class INVALIDATION_EXPORT ObjectIdInvalidationMap {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_H_
+#endif  // COMPONENTS_INVALIDATION_PUBLIC_OBJECT_ID_INVALIDATION_MAP_H_
diff --git a/components/invalidation/single_object_invalidation_set.cc b/components/invalidation/public/single_object_invalidation_set.cc
index c05c517..a261486 100644
--- a/components/invalidation/single_object_invalidation_set.cc
+++ b/components/invalidation/public/single_object_invalidation_set.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/invalidation/single_object_invalidation_set.h"
+#include "components/invalidation/public/single_object_invalidation_set.h"
 
 #include "base/values.h"
-#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/public/invalidation_util.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/single_object_invalidation_set.h b/components/invalidation/public/single_object_invalidation_set.h
index f424114..244c6dd7 100644
--- a/components/invalidation/single_object_invalidation_set.h
+++ b/components/invalidation/public/single_object_invalidation_set.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_INVALIDATION_SINGLE_OBJECT_INVALIDATION_SET_H_
-#define COMPONENTS_INVALIDATION_SINGLE_OBJECT_INVALIDATION_SET_H_
+#ifndef COMPONENTS_INVALIDATION_PUBLIC_SINGLE_OBJECT_INVALIDATION_SET_H_
+#define COMPONENTS_INVALIDATION_PUBLIC_SINGLE_OBJECT_INVALIDATION_SET_H_
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
-#include "components/invalidation/invalidation.h"
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/public/invalidation.h"
+#include "components/invalidation/public/invalidation_export.h"
+#include "components/invalidation/public/invalidation_util.h"
 
 namespace base {
 class ListValue;
@@ -61,4 +61,4 @@ class INVALIDATION_EXPORT SingleObjectInvalidationSet {
 
 }  // syncer
 
-#endif  // COMPONENTS_INVALIDATION_SINGLE_OBJECT_INVALIDATION_SET_H_
+#endif  // COMPONENTS_INVALIDATION_PUBLIC_SINGLE_OBJECT_INVALIDATION_SET_H_
diff --git a/components/test/DEPS b/components/test/DEPS
index 88da157..b734027 100644
--- a/components/test/DEPS
+++ b/components/test/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   # To initialize the global data of content_settings.
   "+components/content_settings/core/common",
-  "+components/invalidation/android/component_jni_registrar.h",
+  "+components/invalidation/impl/android/component_jni_registrar.h",
   "+content/public/android/java/src/org/chromium/content/browser",
   "+content/public/app/content_jni_onload.h",
   "+content/public/app/content_main.h",
diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc
index 9b59628..0c2dd10 100644
--- a/components/test/run_all_unittests.cc
+++ b/components/test/run_all_unittests.cc
@@ -22,7 +22,7 @@
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
-#include "components/invalidation/android/component_jni_registrar.h"
+#include "components/invalidation/impl/android/component_jni_registrar.h"
 #include "ui/base/android/ui_base_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #endif
diff --git a/sync/tools/BUILD.gn b/sync/tools/BUILD.gn
index 9eefdae..fc6f7ae 100644
--- a/sync/tools/BUILD.gn
+++ b/sync/tools/BUILD.gn
@@ -18,7 +18,7 @@ if (is_linux && !is_chromeos) {
 
     deps = [
       "//base",
-      "//components/invalidation",
+      "//components/invalidation/impl",
       "//sync",
     ]
   }
@@ -33,7 +33,7 @@ if (is_linux && !is_chromeos) {
     deps = [
       ":common",
       "//base",
-      "//components/invalidation",
+      "//components/invalidation/impl",
       "//jingle:notifier",
       "//net",
       "//net:test_support",
@@ -52,7 +52,7 @@ if (is_linux && !is_chromeos) {
     deps = [
       ":common",
       "//base",
-      "//components/invalidation",
+      "//components/invalidation/impl",
       "//jingle:notifier",
       "//net",
       "//net:test_support",
diff --git a/sync/tools/invalidation_helper.h b/sync/tools/invalidation_helper.h
index 455998d..c26c6ef 100644
--- a/sync/tools/invalidation_helper.h
+++ b/sync/tools/invalidation_helper.h
@@ -5,7 +5,7 @@
 #ifndef SYNC_TOOLS_INVALIDATION_HELPER_H_
 #define SYNC_TOOLS_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/sync/tools/null_invalidation_state_tracker.cc b/sync/tools/null_invalidation_state_tracker.cc
index 49d1af3..8e99784 100644
--- a/sync/tools/null_invalidation_state_tracker.cc
+++ b/sync/tools/null_invalidation_state_tracker.cc
@@ -10,7 +10,7 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/task_runner.h"
-#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/public/invalidation_util.h"
 
 namespace syncer {
 
diff --git a/sync/tools/null_invalidation_state_tracker.h b/sync/tools/null_invalidation_state_tracker.h
index 19c1b2e..c444fd3 100644
--- a/sync/tools/null_invalidation_state_tracker.h
+++ b/sync/tools/null_invalidation_state_tracker.h
@@ -7,7 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
-#include "components/invalidation/invalidation_state_tracker.h"
+#include "components/invalidation/impl/invalidation_state_tracker.h"
 
 namespace syncer {
 
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc
index f46d39b..6c3793b 100644
--- a/sync/tools/sync_client.cc
+++ b/sync/tools/sync_client.cc
@@ -20,8 +20,8 @@
 #include "base/rand_util.h"
 #include "base/task_runner.h"
 #include "base/threading/thread.h"
-#include "components/invalidation/non_blocking_invalidator.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/impl/non_blocking_invalidator.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "jingle/notifier/base/notification_method.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "net/base/host_port_pair.h"
diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc
index 6f6f534..2cdd4df 100644
--- a/sync/tools/sync_listen_notifications.cc
+++ b/sync/tools/sync_listen_notifications.cc
@@ -15,12 +15,12 @@
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/threading/thread.h"
-#include "components/invalidation/invalidation_handler.h"
-#include "components/invalidation/invalidation_state_tracker.h"
-#include "components/invalidation/invalidation_util.h"
-#include "components/invalidation/invalidator.h"
-#include "components/invalidation/non_blocking_invalidator.h"
-#include "components/invalidation/object_id_invalidation_map.h"
+#include "components/invalidation/impl/invalidation_state_tracker.h"
+#include "components/invalidation/impl/invalidator.h"
+#include "components/invalidation/impl/non_blocking_invalidator.h"
+#include "components/invalidation/public/invalidation_handler.h"
+#include "components/invalidation/public/invalidation_util.h"
+#include "components/invalidation/public/object_id_invalidation_map.h"
 #include "jingle/notifier/base/notification_method.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "net/base/host_port_pair.h"
diff --git a/sync/tools/sync_tools.gyp b/sync/tools/sync_tools.gyp
index 7d97be6..287178f 100644
--- a/sync/tools/sync_tools.gyp
+++ b/sync/tools/sync_tools.gyp
@@ -17,7 +17,7 @@
     ],
     'dependencies': [
       '../../base/base.gyp:base',
-      '../../components/components.gyp:invalidation',
+      '../../components/components.gyp:invalidation_impl',
       '../sync.gyp:sync',
     ],
     'export_dependent_settings': [
@@ -41,7 +41,7 @@
     ],
     'dependencies': [
       '../../base/base.gyp:base',
-      '../../components/components.gyp:invalidation',
+      '../../components/components.gyp:invalidation_impl',
       '../../jingle/jingle.gyp:notifier',
       '../../net/net.gyp:net',
       '../../net/net.gyp:net_test_support',
@@ -63,7 +63,7 @@
     ],
     'dependencies': [
       '../../base/base.gyp:base',
-      '../../components/components.gyp:invalidation',
+      '../../components/components.gyp:invalidation_impl',
       '../../jingle/jingle.gyp:notifier',
       '../../net/net.gyp:net',
       '../../net/net.gyp:net_test_support',