Finish decoupling sync and invalidations

Moves the remaining invalidations code from
sync/internal_api/public/base/ to components/invalidation/.

TBR=atwilson
BUG=259559

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

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

76 files changed, 191 insertions, 231 deletions

diff --git a/chrome/browser/chromeos/policy/DEPS b/chrome/browser/chromeos/policy/DEPS
index afb5d75..887ac0f 100644
--- a/chrome/browser/chromeos/policy/DEPS
+++ b/chrome/browser/chromeos/policy/DEPS
@@ -1,7 +1,4 @@
 include_rules = [
+  "+components/invalidation",
   "+components/user_manager",
-
-  #TODO(rlarocque): Move this dependency into the invalidation component.
-  #See crbug.com/259559.
-  "+sync/internal_api/public/base",
 ]
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc
index 21d532a..cebd26e 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc
@@ -26,6 +26,7 @@
 #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"
@@ -34,7 +35,6 @@
 #include "content/public/browser/notification_service.h"
 #include "google_apis/gaia/identity_provider.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
 
 class Profile;
 
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc
index c083e42..3f5f6e1 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc
@@ -19,6 +19,7 @@
 #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/invalidator_state.h"
 #include "components/invalidation/profile_invalidation_provider.h"
 #include "components/invalidation/ticl_invalidation_service.h"
 #include "content/public/browser/notification_details.h"
@@ -26,7 +27,6 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_test_util.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace policy {
diff --git a/chrome/browser/extensions/api/push_messaging/DEPS b/chrome/browser/extensions/api/push_messaging/DEPS
index 8c7d15a..1c5f4a4 100644
--- a/chrome/browser/extensions/api/push_messaging/DEPS
+++ b/chrome/browser/extensions/api/push_messaging/DEPS
@@ -1,6 +1,4 @@
 include_rules = [
   "+components/invalidation",
   "+google/cacheinvalidation/types.pb.h",
-  "+sync/internal_api/public/base/invalidation.h",
-  "+sync/internal_api/public/base/invalidation_util.h",
 ]
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
index 3e62fd4..e176f32 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
@@ -17,11 +17,11 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/invalidation/fake_invalidator.h"
+#include "components/invalidation/invalidation.h"
 #include "components/invalidation/invalidation_service.h"
 #include "components/invalidation/profile_invalidation_provider.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "google/cacheinvalidation/types.pb.h"
-#include "sync/internal_api/public/base/invalidation.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using ::testing::SaveArg;
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h
index c666ed3..179c30a 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h
@@ -14,7 +14,7 @@
 #include "base/threading/thread_checker.h"
 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_mapper.h"
 #include "components/invalidation/invalidation_handler.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
+#include "components/invalidation/invalidation_util.h"
 
 namespace invalidation {
 class InvalidationService;
diff --git a/chrome/browser/invalidation/DEPS b/chrome/browser/invalidation/DEPS
index c52fadc..4330e28 100644
--- a/chrome/browser/invalidation/DEPS
+++ b/chrome/browser/invalidation/DEPS
@@ -2,8 +2,6 @@ include_rules = [
   # Needed for P2PInvalidationService construction.
   "+jingle/notifier",
 
-  "+sync/internal_api/public/base",
-
   # Needed for InvalidationController JNI methods.
   "+chrome/jni/InvalidationController_jni.h",
 
diff --git a/chrome/browser/invalidation/invalidation_controller_android.h b/chrome/browser/invalidation/invalidation_controller_android.h
index 196e54a..c55601f 100644
--- a/chrome/browser/invalidation/invalidation_controller_android.h
+++ b/chrome/browser/invalidation/invalidation_controller_android.h
@@ -9,7 +9,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
+#include "components/invalidation/invalidation_util.h"
 
 namespace invalidation {
 
diff --git a/chrome/browser/policy/cloud/DEPS b/chrome/browser/policy/cloud/DEPS
index 5131eea..d0a9131 100644
--- a/chrome/browser/policy/cloud/DEPS
+++ b/chrome/browser/policy/cloud/DEPS
@@ -39,16 +39,7 @@ specific_include_rules = {
     "+content/test/net",
   ],
 
-  r"cloud_policy_browsertest.cc": [
-    "+sync/internal_api/public/base/invalidation.h",
-  ],
-
-  r"cloud_policy_invalidator.h": [
-    "+sync/internal_api/public/base/invalidation.h",
-  ],
-
   r"cloud_policy_invalidator_unittest\.cc": [
     "+chrome/browser/invalidation/fake_invalidation_service.h",
-    "+sync/internal_api/public/base/invalidation_util.h",
   ],
 }
diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
index c1bd8a4..517a560 100644
--- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
@@ -23,6 +23,7 @@
 #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/keyed_service/core/keyed_service.h"
@@ -42,7 +43,6 @@
 #include "policy/policy_constants.h"
 #include "policy/proto/chrome_settings.pb.h"
 #include "policy/proto/cloud_policy.pb.h"
-#include "sync/internal_api/public/base/invalidation.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.h b/chrome/browser/policy/cloud/cloud_policy_invalidator.h
index 1a73fa5..ef51880 100644
--- a/chrome/browser/policy/cloud/cloud_policy_invalidator.h
+++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.h
@@ -13,11 +13,11 @@
 #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/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "google/cacheinvalidation/include/types.h"
-#include "sync/internal_api/public/base/invalidation.h"
 
 namespace base {
 class Clock;
diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc
index 1fe6cba..75f7ec4 100644
--- a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc
@@ -20,6 +20,7 @@
 #include "base/values.h"
 #include "chrome/browser/invalidation/fake_invalidation_service.h"
 #include "chrome/browser/policy/cloud/cloud_policy_invalidator.h"
+#include "components/invalidation/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"
@@ -29,7 +30,6 @@
 #include "components/policy/core/common/policy_types.h"
 #include "policy/policy_constants.h"
 #include "policy/proto/device_management_backend.pb.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/sync/glue/invalidation_adapter.h b/chrome/browser/sync/glue/invalidation_adapter.h
index 509a872..c0c588f 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 "sync/internal_api/public/base/invalidation.h"
+#include "components/invalidation/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 3dea357..b53709e 100644
--- a/chrome/browser/sync/glue/invalidation_helper.h
+++ b/chrome/browser/sync/glue/invalidation_helper.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_SYNC_GLUE_INVALIDATION_HELPER_H_
 #define CHROME_BROWSER_SYNC_GLUE_INVALIDATION_HELPER_H_
 
+#include "components/invalidation/invalidation_util.h"
 #include "google/cacheinvalidation/include/types.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 #include "sync/internal_api/public/base/model_type.h"
 
 namespace syncer {
diff --git a/chrome/browser/sync/glue/sync_backend_host_core.cc b/chrome/browser/sync/glue/sync_backend_host_core.cc
index d528ec4..98e1a4e 100644
--- a/chrome/browser/sync/glue/sync_backend_host_core.cc
+++ b/chrome/browser/sync/glue/sync_backend_host_core.cc
@@ -11,8 +11,8 @@
 #include "chrome/browser/sync/glue/sync_backend_registrar.h"
 #include "chrome/browser/sync/glue/synced_device_tracker.h"
 #include "chrome/common/chrome_version_info.h"
+#include "components/invalidation/invalidation_util.h"
 #include "components/invalidation/object_id_invalidation_map.h"
-#include "sync/internal_api/public/base/invalidation_util.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_unittest.cc b/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc
index 664dfe4..7d61958 100644
--- a/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc
+++ b/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc
@@ -20,6 +20,7 @@
 #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/sync_driver/sync_frontend.h"
@@ -30,7 +31,6 @@
 #include "google/cacheinvalidation/include/types.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "net/url_request/test_url_fetcher_factory.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
 #include "sync/internal_api/public/http_bridge_network_resources.h"
diff --git a/chrome/browser/sync/profile_sync_service_android.h b/chrome/browser/sync/profile_sync_service_android.h
index 5e1310c..3f651cf 100644
--- a/chrome/browser/sync/profile_sync_service_android.h
+++ b/chrome/browser/sync/profile_sync_service_android.h
@@ -13,10 +13,10 @@
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
+#include "components/invalidation/invalidation_util.h"
 #include "components/sync_driver/sync_prefs.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "google_apis/gaia/google_service_auth_error.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 
 class Profile;
 class ProfileSyncService;
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 c56b753..3324d0c 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 "sync/internal_api/public/base/invalidation.h"
 #include "sync/internal_api/public/base/model_type.h"
 
 namespace fake_server {
diff --git a/chrome/browser/ui/webui/DEPS b/chrome/browser/ui/webui/DEPS
index 8255dae..acfa06d 100644
--- a/chrome/browser/ui/webui/DEPS
+++ b/chrome/browser/ui/webui/DEPS
@@ -6,7 +6,6 @@ include_rules = [
   "+sync/internal_api/public/sessions",
   "+sync/internal_api/public/events",
   "+sync/internal_api/public/util/weak_handle.h",
-  "+sync/internal_api/public/base/invalidation_util.h",
 
   # Other libraries.
   "+components/onc",
diff --git a/chrome/browser/ui/webui/invalidations_message_handler.h b/chrome/browser/ui/webui/invalidations_message_handler.h
index 04cb678..6d65faf 100644
--- a/chrome/browser/ui/webui/invalidations_message_handler.h
+++ b/chrome/browser/ui/webui/invalidations_message_handler.h
@@ -10,8 +10,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "components/invalidation/invalidation_logger_observer.h"
+#include "components/invalidation/invalidation_util.h"
 #include "content/public/browser/web_ui_message_handler.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 
 class Profile;
 
diff --git a/components/invalidation.gypi b/components/invalidation.gypi
index 769e269..e7be8dd 100644
--- a/components/invalidation.gypi
+++ b/components/invalidation.gypi
@@ -29,6 +29,12 @@
       ],
       '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',
@@ -43,10 +49,14 @@
         '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',
@@ -124,6 +134,8 @@
         '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',
diff --git a/components/invalidation/BUILD.gn b/components/invalidation/BUILD.gn
index 0bf7988..fd6773a 100644
--- a/components/invalidation/BUILD.gn
+++ b/components/invalidation/BUILD.gn
@@ -4,6 +4,12 @@
 
 static_library("invalidation") {
   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",
@@ -18,10 +24,14 @@ static_library("invalidation") {
     "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",
@@ -96,6 +106,8 @@ static_library("test_support") {
     "fake_invalidator.h",
     "invalidation_service_test_template.cc",
     "invalidation_service_test_template.h",
+    "invalidation_test_util.cc",
+    "invalidation_test_util.h",
     "invalidator_test_template.cc",
     "invalidator_test_template.h",
     "object_id_invalidation_map_test_util.cc",
diff --git a/components/invalidation/DEPS b/components/invalidation/DEPS
index 48f688d..e56ab22 100644
--- a/components/invalidation/DEPS
+++ b/components/invalidation/DEPS
@@ -16,11 +16,9 @@ include_rules = [
   "+net/http/http_status_code.h",
   "+net/url_request",
 
-  # sync_notifier depends on the xmpp part of libjingle.
+  # invalidation_notifier depends on the xmpp part of libjingle.
   "+talk/xmpp",
 
-  #TODO(rlarocque): Move these dependencies into this component.
-  # See crbug.com/259559.
-  "+sync/internal_api/public/base",
-  "+sync/internal_api/public/util",
+  #TODO(rlarocque): Remove this dependency. See crbug.com/394925.
+  "+sync/internal_api/public/util/weak_handle.h",
 ]
diff --git a/sync/internal_api/public/base/ack_handle.cc b/components/invalidation/ack_handle.cc
index f5ddf12..ee0e8b6 100644
--- a/sync/internal_api/public/base/ack_handle.cc
+++ b/components/invalidation/ack_handle.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sync/internal_api/public/base/ack_handle.h"
+#include "components/invalidation/ack_handle.h"
 
 #include <cstddef>
 #include "base/rand_util.h"
diff --git a/sync/internal_api/public/base/ack_handle.h b/components/invalidation/ack_handle.h
index 99d03af..2435efa 100644
--- a/sync/internal_api/public/base/ack_handle.h
+++ b/components/invalidation/ack_handle.h
@@ -1,16 +1,16 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_INTERNAL_API_PUBLIC_BASE_ACK_HANDLE_H
-#define SYNC_INTERNAL_API_PUBLIC_BASE_ACK_HANDLE_H
+#ifndef COMPONENTS_INVALIDATION_ACK_HANDLE_H_
+#define COMPONENTS_INVALIDATION_ACK_HANDLE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
-#include "sync/base/sync_export.h"
+#include "components/invalidation/invalidation_export.h"
 
 namespace base {
 class DictionaryValue;
@@ -20,7 +20,7 @@ namespace syncer {
 
 // Opaque class that represents a local ack handle. We don't reuse the
 // invalidation ack handles to avoid unnecessary dependencies.
-class SYNC_EXPORT AckHandle {
+class INVALIDATION_EXPORT AckHandle {
  public:
   static AckHandle CreateUnique();
   static AckHandle InvalidAckHandle();
@@ -44,4 +44,4 @@ class SYNC_EXPORT AckHandle {
 
 }  // namespace syncer
 
-#endif  // SYNC_INTERNAL_API_PUBLIC_BASE_ACK_HANDLE_H
+#endif  // COMPONENTS_INVALIDATION_ACK_HANDLE_H_
diff --git a/sync/internal_api/public/base/ack_handler.cc b/components/invalidation/ack_handler.cc
index ffed173..68dc028 100644
--- a/sync/internal_api/public/base/ack_handler.cc
+++ b/components/invalidation/ack_handler.cc
@@ -2,14 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sync/internal_api/public/base/ack_handler.h"
+#include "components/invalidation/ack_handler.h"
 
-#include "sync/internal_api/public/base/invalidation.h"
+#include "components/invalidation/invalidation.h"
 
 namespace syncer {
 
-AckHandler::AckHandler() {}
+AckHandler::AckHandler() {
+}
 
-AckHandler::~AckHandler() {}
+AckHandler::~AckHandler() {
+}
 
 }  // namespace syncer
diff --git a/sync/internal_api/public/base/ack_handler.h b/components/invalidation/ack_handler.h
index 7fcd6a4..0a2f642 100644
--- a/sync/internal_api/public/base/ack_handler.h
+++ b/components/invalidation/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 SYNC_INTERNAL_API_PUBLIC_BASE_ACK_HANDLER_H_
-#define SYNC_INTERNAL_API_PUBLIC_BASE_ACK_HANDLER_H_
+#ifndef COMPONENTS_INVALIDATION_ACK_HANDLER_H_
+#define COMPONENTS_INVALIDATION_ACK_HANDLER_H_
 
 #include <vector>
 
-#include "sync/base/sync_export.h"
+#include "components/invalidation/invalidation_export.h"
 
 namespace invalidation {
 class ObjectId;
@@ -21,22 +21,20 @@ class AckHandle;
 //
 // We don't expect to support more than one "real" implementation of AckHandler,
 // but this interface is very useful for testing and implementation hiding.
-class SYNC_EXPORT AckHandler {
+class INVALIDATION_EXPORT AckHandler {
  public:
   AckHandler();
   virtual ~AckHandler() = 0;
 
   // Record the local acknowledgement of an invalidation identified by |handle|.
-  virtual void Acknowledge(
-      const invalidation::ObjectId& id,
-      const AckHandle& handle) = 0;
+  virtual void Acknowledge(const invalidation::ObjectId& id,
+                           const AckHandle& handle) = 0;
 
   // Record the drop of an invalidation identified by |handle|.
-  virtual void Drop(
-      const invalidation::ObjectId& id,
-      const AckHandle& handle) = 0;
+  virtual void Drop(const invalidation::ObjectId& id,
+                    const AckHandle& handle) = 0;
 };
 
 }  // namespace syncer
 
-#endif  // SYNC_INTERNAL_API_PUBLIC_BASE_ACK_HANDLER_H_
+#endif  // COMPONENTS_INVALIDATION_ACK_HANDLER_H_
diff --git a/components/invalidation/fake_invalidator.h b/components/invalidation/fake_invalidator.h
index e149dbf..38e8c56 100644
--- a/components/invalidation/fake_invalidator.h
+++ b/components/invalidation/fake_invalidator.h
@@ -9,9 +9,9 @@
 
 #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 "sync/internal_api/public/base/invalidation_util.h"
 
 namespace syncer {
 
diff --git a/sync/internal_api/public/base/invalidation.cc b/components/invalidation/invalidation.cc
index 4e1135c..0962c9e 100644
--- a/sync/internal_api/public/base/invalidation.cc
+++ b/components/invalidation/invalidation.cc
@@ -1,8 +1,8 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sync/internal_api/public/base/invalidation.h"
+#include "components/invalidation/invalidation.h"
 
 #include <cstddef>
 
@@ -10,8 +10,8 @@
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
-#include "sync/internal_api/public/base/ack_handler.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
+#include "components/invalidation/ack_handler.h"
+#include "components/invalidation/invalidation_util.h"
 
 namespace syncer {
 
@@ -23,23 +23,22 @@ const char kPayloadKey[] = "payload";
 const int64 kInvalidVersion = -1;
 }
 
-Invalidation Invalidation::Init(
-    const invalidation::ObjectId& id,
-    int64 version,
-    const std::string& payload) {
+Invalidation Invalidation::Init(const invalidation::ObjectId& id,
+                                int64 version,
+                                const std::string& payload) {
   return Invalidation(id, false, version, payload, AckHandle::CreateUnique());
 }
 
 Invalidation Invalidation::InitUnknownVersion(
     const invalidation::ObjectId& id) {
-  return Invalidation(id, true, kInvalidVersion,
-                      std::string(), AckHandle::CreateUnique());
+  return Invalidation(
+      id, true, kInvalidVersion, std::string(), AckHandle::CreateUnique());
 }
 
 Invalidation Invalidation::InitFromDroppedInvalidation(
     const Invalidation& dropped) {
-  return Invalidation(dropped.id_, true, kInvalidVersion,
-                      std::string(), dropped.ack_handle_);
+  return Invalidation(
+      dropped.id_, true, kInvalidVersion, std::string(), dropped.ack_handle_);
 }
 
 scoped_ptr<Invalidation> Invalidation::InitFromValue(
@@ -47,8 +46,8 @@ scoped_ptr<Invalidation> Invalidation::InitFromValue(
   invalidation::ObjectId id;
 
   const base::DictionaryValue* object_id_dict;
-  if (!value.GetDictionary(kObjectIdKey, &object_id_dict)
-      || !ObjectIdFromValue(*object_id_dict, &id)) {
+  if (!value.GetDictionary(kObjectIdKey, &object_id_dict) ||
+      !ObjectIdFromValue(*object_id_dict, &id)) {
     DLOG(WARNING) << "Failed to parse id";
     return scoped_ptr<Invalidation>();
   }
@@ -85,7 +84,8 @@ scoped_ptr<Invalidation> Invalidation::InitFromValue(
       AckHandle::CreateUnique()));
 }
 
-Invalidation::~Invalidation() {}
+Invalidation::~Invalidation() {
+}
 
 invalidation::ObjectId Invalidation::object_id() const {
   return id_;
@@ -119,27 +119,19 @@ bool Invalidation::SupportsAcknowledgement() const {
 
 void Invalidation::Acknowledge() const {
   if (SupportsAcknowledgement()) {
-    ack_handler_.Call(FROM_HERE,
-                      &AckHandler::Acknowledge,
-                      id_,
-                      ack_handle_);
+    ack_handler_.Call(FROM_HERE, &AckHandler::Acknowledge, id_, ack_handle_);
   }
 }
 
 void Invalidation::Drop() {
   if (SupportsAcknowledgement()) {
-    ack_handler_.Call(FROM_HERE,
-                      &AckHandler::Drop,
-                      id_,
-                      ack_handle_);
+    ack_handler_.Call(FROM_HERE, &AckHandler::Drop, id_, ack_handle_);
   }
 }
 
 bool Invalidation::Equals(const Invalidation& other) const {
-  return id_ == other.id_
-      && is_unknown_version_ == other.is_unknown_version_
-      && version_ == other.version_
-      && payload_ == other.payload_;
+  return id_ == other.id_ && is_unknown_version_ == other.is_unknown_version_ &&
+         version_ == other.version_ && payload_ == other.payload_;
 }
 
 scoped_ptr<base::DictionaryValue> Invalidation::ToValue() const {
@@ -163,16 +155,16 @@ std::string Invalidation::ToString() const {
   return output;
 }
 
-Invalidation::Invalidation(
-    const invalidation::ObjectId& id,
-    bool is_unknown_version,
-    int64 version,
-    const std::string& payload,
-    AckHandle ack_handle)
-  : id_(id),
-    is_unknown_version_(is_unknown_version),
-    version_(version),
-    payload_(payload),
-    ack_handle_(ack_handle) {}
+Invalidation::Invalidation(const invalidation::ObjectId& id,
+                           bool is_unknown_version,
+                           int64 version,
+                           const std::string& payload,
+                           AckHandle ack_handle)
+    : id_(id),
+      is_unknown_version_(is_unknown_version),
+      version_(version),
+      payload_(payload),
+      ack_handle_(ack_handle) {
+}
 
 }  // namespace syncer
diff --git a/sync/internal_api/public/base/invalidation.h b/components/invalidation/invalidation.h
index 6d78612..4d6a5e3 100644
--- a/sync/internal_api/public/base/invalidation.h
+++ b/components/invalidation/invalidation.h
@@ -1,18 +1,18 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_H_
-#define SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_H_
+#ifndef COMPONENTS_INVALIDATION_INVALIDATION_H_
+#define COMPONENTS_INVALIDATION_INVALIDATION_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
+#include "components/invalidation/ack_handle.h"
+#include "components/invalidation/invalidation_export.h"
 #include "google/cacheinvalidation/include/types.h"
-#include "sync/base/sync_export.h"
-#include "sync/internal_api/public/base/ack_handle.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 
 namespace syncer {
@@ -23,13 +23,12 @@ class AckHandler;
 // Represents a local invalidation, and is roughly analogous to
 // invalidation::Invalidation.  Unlike invalidation::Invalidation, this class
 // supports "local" ack-tracking and simple serialization to pref values.
-class SYNC_EXPORT Invalidation {
+class INVALIDATION_EXPORT Invalidation {
  public:
   // Factory functions.
-  static Invalidation Init(
-      const invalidation::ObjectId& id,
-      int64 version,
-      const std::string& payload);
+  static Invalidation Init(const invalidation::ObjectId& id,
+                           int64 version,
+                           const std::string& payload);
   static Invalidation InitUnknownVersion(const invalidation::ObjectId& id);
   static Invalidation InitFromDroppedInvalidation(const Invalidation& dropped);
   static scoped_ptr<Invalidation> InitFromValue(
@@ -119,4 +118,4 @@ class SYNC_EXPORT Invalidation {
 
 }  // namespace syncer
 
-#endif  // SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_H_
+#endif  // COMPONENTS_INVALIDATION_INVALIDATION_H_
diff --git a/components/invalidation/invalidation_handler.h b/components/invalidation/invalidation_handler.h
index 6180aa3..665406d 100644
--- a/components/invalidation/invalidation_handler.h
+++ b/components/invalidation/invalidation_handler.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "components/invalidation/invalidation_export.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
+#include "components/invalidation/invalidator_state.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/invalidation_logger.h b/components/invalidation/invalidation_logger.h
index 0fb6be7..39d754e 100644
--- a/components/invalidation/invalidation_logger.h
+++ b/components/invalidation/invalidation_logger.h
@@ -10,8 +10,8 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
+#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/invalidator_state.h"
 
 namespace base {
 class DictionaryValue;
diff --git a/components/invalidation/invalidation_logger_observer.h b/components/invalidation/invalidation_logger_observer.h
index c5daa2e..d754b93 100644
--- a/components/invalidation/invalidation_logger_observer.h
+++ b/components/invalidation/invalidation_logger_observer.h
@@ -6,9 +6,9 @@
 #define COMPONENTS_INVALIDATION_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 "sync/internal_api/public/base/invalidation_util.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
 
 namespace base {
 class DictionaryValue;
diff --git a/components/invalidation/invalidation_notifier.h b/components/invalidation/invalidation_notifier.h
index c776fb5..154d1e6 100644
--- a/components/invalidation/invalidation_notifier.h
+++ b/components/invalidation/invalidation_notifier.h
@@ -23,7 +23,6 @@
 #include "components/invalidation/invalidator.h"
 #include "components/invalidation/invalidator_registrar.h"
 #include "components/invalidation/sync_invalidation_listener.h"
-#include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 
 namespace notifier {
diff --git a/components/invalidation/invalidation_notifier_unittest.cc b/components/invalidation/invalidation_notifier_unittest.cc
index 7240c84..5fd249f 100644
--- a/components/invalidation/invalidation_notifier_unittest.cc
+++ b/components/invalidation/invalidation_notifier_unittest.cc
@@ -15,7 +15,6 @@
 #include "jingle/notifier/base/notifier_options.h"
 #include "jingle/notifier/listener/fake_push_client.h"
 #include "net/url_request/url_request_test_util.h"
-#include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/invalidation/invalidation_service.h b/components/invalidation/invalidation_service.h
index 92ecd3d..bf7a23d 100644
--- a/components/invalidation/invalidation_service.h
+++ b/components/invalidation/invalidation_service.h
@@ -6,8 +6,8 @@
 #define COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_H_
 
 #include "base/callback_forward.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
+#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/invalidator_state.h"
 
 class IdentityProvider;
 
diff --git a/components/invalidation/invalidation_service_test_template.h b/components/invalidation/invalidation_service_test_template.h
index 94ef33e..ae1d04f 100644
--- a/components/invalidation/invalidation_service_test_template.h
+++ b/components/invalidation/invalidation_service_test_template.h
@@ -73,14 +73,14 @@
 
 #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 "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/types.pb.h"
-#include "sync/internal_api/public/base/ack_handle.h"
-#include "sync/internal_api/public/base/invalidation.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 template <typename InvalidatorTestDelegate>
diff --git a/components/invalidation/invalidation_state_tracker.h b/components/invalidation/invalidation_state_tracker.h
index 0d8acf8..6e03dab 100644
--- a/components/invalidation/invalidation_state_tracker.h
+++ b/components/invalidation/invalidation_state_tracker.h
@@ -18,11 +18,11 @@
 #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 "google/cacheinvalidation/include/types.h"
-#include "sync/internal_api/public/base/invalidation.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 
 namespace base {
 class TaskRunner;
diff --git a/sync/internal_api/public/base/invalidation_test_util.cc b/components/invalidation/invalidation_test_util.cc
index 3c610da..3368797 100644
--- a/sync/internal_api/public/base/invalidation_test_util.cc
+++ b/components/invalidation/invalidation_test_util.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sync/internal_api/public/base/invalidation_test_util.h"
+#include "components/invalidation/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 "sync/internal_api/public/base/invalidation.h"
+#include "components/invalidation/invalidation.h"
 
 namespace syncer {
 
@@ -20,8 +20,7 @@ using ::testing::PrintToString;
 
 namespace {
 
-class AckHandleEqMatcher
-    : public MatcherInterface<const AckHandle&> {
+class AckHandleEqMatcher : public MatcherInterface<const AckHandle&> {
  public:
   explicit AckHandleEqMatcher(const AckHandle& expected);
 
@@ -53,8 +52,7 @@ void AckHandleEqMatcher::DescribeNegationTo(::std::ostream* os) const {
   *os << " isn't equal to " << PrintToString(expected_);
 }
 
-class InvalidationEqMatcher
-    : public MatcherInterface<const Invalidation&> {
+class InvalidationEqMatcher : public MatcherInterface<const Invalidation&> {
  public:
   explicit InvalidationEqMatcher(const Invalidation& expected);
 
@@ -69,12 +67,13 @@ class InvalidationEqMatcher
   DISALLOW_COPY_AND_ASSIGN(InvalidationEqMatcher);
 };
 
-InvalidationEqMatcher::InvalidationEqMatcher(
-    const Invalidation& expected) : expected_(expected) {
+InvalidationEqMatcher::InvalidationEqMatcher(const Invalidation& expected)
+    : expected_(expected) {
 }
 
 bool InvalidationEqMatcher::MatchAndExplain(
-    const Invalidation& actual, MatchResultListener* listener) const {
+    const Invalidation& actual,
+    MatchResultListener* listener) const {
   if (!(expected_.object_id() == actual.object_id())) {
     return false;
   }
@@ -84,8 +83,8 @@ bool InvalidationEqMatcher::MatchAndExplain(
     return false;
   } else {
     // Neither is unknown version.
-    return expected_.payload() == actual.payload()
-        && expected_.version() == actual.version();
+    return expected_.payload() == actual.payload() &&
+           expected_.version() == actual.version();
   }
 }
 
@@ -99,7 +98,7 @@ void InvalidationEqMatcher::DescribeNegationTo(::std::ostream* os) const {
 
 }  // namespace
 
-void PrintTo(const AckHandle& ack_handle, ::std::ostream* os ) {
+void PrintTo(const AckHandle& ack_handle, ::std::ostream* os) {
   scoped_ptr<base::Value> value(ack_handle.ToValue());
   std::string printable_ack_handle;
   base::JSONWriter::Write(value.get(), &printable_ack_handle);
diff --git a/sync/internal_api/public/base/invalidation_test_util.h b/components/invalidation/invalidation_test_util.h
index e7c08caa..c039494 100644
--- a/sync/internal_api/public/base/invalidation_test_util.h
+++ b/components/invalidation/invalidation_test_util.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_TEST_UTIL_H_
-#define SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_TEST_UTIL_H_
+#ifndef COMPONENTS_INVALIDATION_INVALIDATION_TEST_UTIL_H_
+#define COMPONENTS_INVALIDATION_INVALIDATION_TEST_UTIL_H_
 
 #include <iosfwd>
 
@@ -23,4 +23,4 @@ void PrintTo(const Invalidation& invalidation, ::std::ostream* os);
 
 }  // namespace syncer
 
-#endif  // SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_TEST_UTIL_H_
+#endif  // COMPONENTS_INVALIDATION_INVALIDATION_TEST_UTIL_H_
diff --git a/sync/internal_api/public/base/invalidation_util.cc b/components/invalidation/invalidation_util.cc
index 6433677..50e3a5c 100644
--- a/sync/internal_api/public/base/invalidation_util.cc
+++ b/components/invalidation/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 "sync/internal_api/public/base/invalidation_util.h"
+#include "components/invalidation/invalidation_util.h"
 
 #include <ostream>
 #include <sstream>
@@ -10,9 +10,9 @@
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
+#include "components/invalidation/invalidation.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/types.pb.h"
-#include "sync/internal_api/public/base/invalidation.h"
 
 namespace syncer {
 
@@ -22,9 +22,8 @@ bool ObjectIdLessThan::operator()(const invalidation::ObjectId& lhs,
          (lhs.source() == rhs.source() && lhs.name() < rhs.name());
 }
 
-bool InvalidationVersionLessThan::operator()(
-    const Invalidation& a,
-    const Invalidation& b) const {
+bool InvalidationVersionLessThan::operator()(const Invalidation& a,
+                                             const Invalidation& b) const {
   DCHECK(a.object_id() == b.object_id())
       << "a: " << ObjectIdToString(a.object_id()) << ", "
       << "b: " << ObjectIdToString(a.object_id());
@@ -54,16 +53,14 @@ bool ObjectIdFromValue(const base::DictionaryValue& value,
   *out = invalidation::ObjectId();
   std::string name;
   int source = 0;
-  if (!value.GetInteger("source", &source) ||
-      !value.GetString("name", &name)) {
+  if (!value.GetInteger("source", &source) || !value.GetString("name", &name)) {
     return false;
   }
   *out = invalidation::ObjectId(source, name);
   return true;
 }
 
-std::string ObjectIdToString(
-    const invalidation::ObjectId& object_id) {
+std::string ObjectIdToString(const invalidation::ObjectId& object_id) {
   scoped_ptr<base::DictionaryValue> value(ObjectIdToValue(object_id));
   std::string str;
   base::JSONWriter::Write(value.get(), &str);
diff --git a/sync/internal_api/public/base/invalidation_util.h b/components/invalidation/invalidation_util.h
index 2de2d20..b5b21b6 100644
--- a/sync/internal_api/public/base/invalidation_util.h
+++ b/components/invalidation/invalidation_util.h
@@ -4,37 +4,35 @@
 //
 // Various utilities for dealing with invalidation data types.
 
-#ifndef SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_UTIL_H_
-#define SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_UTIL_H_
+#ifndef COMPONENTS_INVALIDATION_INVALIDATION_UTIL_H_
+#define COMPONENTS_INVALIDATION_INVALIDATION_UTIL_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "sync/base/sync_export.h"
+#include "components/invalidation/invalidation_export.h"
 
 namespace base {
 class DictionaryValue;
 }  // namespace
 
 namespace invalidation {
-
 class Invalidation;
 class ObjectId;
-
 }  // namespace invalidation
 
 namespace syncer {
 
 class Invalidation;
 
-struct SYNC_EXPORT ObjectIdLessThan {
+struct INVALIDATION_EXPORT ObjectIdLessThan {
   bool operator()(const invalidation::ObjectId& lhs,
                   const invalidation::ObjectId& rhs) const;
 };
 
-struct SYNC_EXPORT InvalidationVersionLessThan {
+struct INVALIDATION_EXPORT InvalidationVersionLessThan {
   bool operator()(const syncer::Invalidation& a,
                   const syncer::Invalidation& b) const;
 };
@@ -51,9 +49,9 @@ scoped_ptr<base::DictionaryValue> ObjectIdToValue(
 bool ObjectIdFromValue(const base::DictionaryValue& value,
                        invalidation::ObjectId* out);
 
-SYNC_EXPORT_PRIVATE std::string ObjectIdToString(
+INVALIDATION_EXPORT std::string ObjectIdToString(
     const invalidation::ObjectId& object_id);
 
 }  // namespace syncer
 
-#endif  // SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_UTIL_H_
+#endif  // COMPONENTS_INVALIDATION_INVALIDATION_UTIL_H_
diff --git a/components/invalidation/invalidator.h b/components/invalidation/invalidator.h
index fc4c355..35c81de0 100644
--- a/components/invalidation/invalidator.h
+++ b/components/invalidation/invalidator.h
@@ -13,9 +13,8 @@
 
 #include "base/callback.h"
 #include "components/invalidation/invalidation_export.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
-#include "sync/internal_api/public/base/model_type.h"
+#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/invalidator_state.h"
 
 namespace syncer {
 class InvalidationHandler;
diff --git a/components/invalidation/invalidator_registrar.h b/components/invalidation/invalidator_registrar.h
index 561d29e..f2e41a2 100644
--- a/components/invalidation/invalidator_registrar.h
+++ b/components/invalidation/invalidator_registrar.h
@@ -12,7 +12,7 @@
 #include "base/threading/thread_checker.h"
 #include "components/invalidation/invalidation_export.h"
 #include "components/invalidation/invalidation_handler.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
+#include "components/invalidation/invalidation_util.h"
 
 namespace invalidation {
 class ObjectId;
diff --git a/sync/internal_api/public/base/invalidator_state.cc b/components/invalidation/invalidator_state.cc
index e42ca63..1ad3c45 100644
--- a/sync/internal_api/public/base/invalidator_state.cc
+++ b/components/invalidation/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 "sync/internal_api/public/base/invalidator_state.h"
+#include "components/invalidation/invalidator_state.h"
 
 #include "base/logging.h"
 
diff --git a/sync/internal_api/public/base/invalidator_state.h b/components/invalidation/invalidator_state.h
index 3a1c7ee..cee5bd8 100644
--- a/sync/internal_api/public/base/invalidator_state.h
+++ b/components/invalidation/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 SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATOR_STATE_H_
-#define SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATOR_STATE_H_
+#ifndef COMPONENTS_INVALIDATION_INVALIDATOR_STATE_H_
+#define COMPONENTS_INVALIDATION_INVALIDATOR_STATE_H_
 
-#include "sync/base/sync_export.h"
+#include "components/invalidation/invalidation_export.h"
 
 namespace syncer {
 
@@ -23,8 +23,9 @@ enum InvalidatorState {
   INVALIDATIONS_ENABLED
 };
 
-SYNC_EXPORT const char* InvalidatorStateToString(InvalidatorState state);
+INVALIDATION_EXPORT const char* InvalidatorStateToString(
+    InvalidatorState state);
 
 }  // namespace syncer
 
-#endif  // SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATOR_STATE_H_
+#endif  // COMPONENTS_INVALIDATION_INVALIDATOR_STATE_H_
diff --git a/components/invalidation/mock_ack_handler.cc b/components/invalidation/mock_ack_handler.cc
index 359090c..aba96cb 100644
--- a/components/invalidation/mock_ack_handler.cc
+++ b/components/invalidation/mock_ack_handler.cc
@@ -4,8 +4,8 @@
 
 #include "components/invalidation/mock_ack_handler.h"
 
-#include "sync/internal_api/public/base/ack_handle.h"
-#include "sync/internal_api/public/base/invalidation.h"
+#include "components/invalidation/ack_handle.h"
+#include "components/invalidation/invalidation.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/mock_ack_handler.h b/components/invalidation/mock_ack_handler.h
index c22f810..cd394b7 100644
--- a/components/invalidation/mock_ack_handler.h
+++ b/components/invalidation/mock_ack_handler.h
@@ -10,9 +10,9 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
+#include "components/invalidation/ack_handler.h"
 #include "components/invalidation/invalidation_export.h"
-#include "sync/internal_api/public/base/ack_handler.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
+#include "components/invalidation/invalidation_util.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 
 namespace syncer {
diff --git a/components/invalidation/non_blocking_invalidator.h b/components/invalidation/non_blocking_invalidator.h
index e2c31c7..ab19ce1 100644
--- a/components/invalidation/non_blocking_invalidator.h
+++ b/components/invalidation/non_blocking_invalidator.h
@@ -19,9 +19,9 @@
 #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 "jingle/notifier/base/notifier_options.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
 
 namespace base {
 class SingleThreadTaskRunner;
diff --git a/components/invalidation/notifier_reason_util.h b/components/invalidation/notifier_reason_util.h
index 530cbb8..16025ba 100644
--- a/components/invalidation/notifier_reason_util.h
+++ b/components/invalidation/notifier_reason_util.h
@@ -5,8 +5,8 @@
 #ifndef COMPONENTS_INVALIDATION_NOTIFIER_REASON_UTIL_H_
 #define COMPONENTS_INVALIDATION_NOTIFIER_REASON_UTIL_H_
 
+#include "components/invalidation/invalidator_state.h"
 #include "jingle/notifier/listener/push_client_observer.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/object_id_invalidation_map.h b/components/invalidation/object_id_invalidation_map.h
index c2eecb0..ac37d30 100644
--- a/components/invalidation/object_id_invalidation_map.h
+++ b/components/invalidation/object_id_invalidation_map.h
@@ -8,10 +8,10 @@
 #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 "sync/internal_api/public/base/invalidation.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/object_id_invalidation_map_test_util.cc b/components/invalidation/object_id_invalidation_map_test_util.cc
index 0711e1e..f52674f 100644
--- a/components/invalidation/object_id_invalidation_map_test_util.cc
+++ b/components/invalidation/object_id_invalidation_map_test_util.cc
@@ -39,8 +39,6 @@ ObjectIdInvalidationMapEqMatcher::ObjectIdInvalidationMapEqMatcher(
     const ObjectIdInvalidationMap& expected) : expected_(expected) {
 }
 
-namespace {
-
 struct InvalidationEqPredicate {
   InvalidationEqPredicate(const Invalidation& inv1)
       : inv1_(inv1) { }
@@ -52,8 +50,6 @@ struct InvalidationEqPredicate {
   const Invalidation& inv1_;
 };
 
-}
-
 bool ObjectIdInvalidationMapEqMatcher::MatchAndExplain(
     const ObjectIdInvalidationMap& actual,
     MatchResultListener* listener) const {
diff --git a/components/invalidation/object_id_invalidation_map_test_util.h b/components/invalidation/object_id_invalidation_map_test_util.h
index b1e1a93..9be67a8 100644
--- a/components/invalidation/object_id_invalidation_map_test_util.h
+++ b/components/invalidation/object_id_invalidation_map_test_util.h
@@ -6,8 +6,8 @@
 #define COMPONENTS_INVALIDATION_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 "sync/internal_api/public/base/invalidation_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace syncer {
diff --git a/components/invalidation/p2p_invalidator.cc b/components/invalidation/p2p_invalidator.cc
index c3f0359..c583d44 100644
--- a/components/invalidation/p2p_invalidator.cc
+++ b/components/invalidation/p2p_invalidator.cc
@@ -12,10 +12,10 @@
 #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 "jingle/notifier/listener/push_client.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/p2p_invalidator.h b/components/invalidation/p2p_invalidator.h
index 683b462..f82914e 100644
--- a/components/invalidation/p2p_invalidator.h
+++ b/components/invalidation/p2p_invalidator.h
@@ -19,12 +19,11 @@
 #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 "jingle/notifier/base/notifier_options.h"
 #include "jingle/notifier/listener/push_client.h"
 #include "jingle/notifier/listener/push_client_observer.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
-#include "sync/internal_api/public/base/model_type.h"
 
 namespace notifier {
 class PushClient;
diff --git a/components/invalidation/p2p_invalidator_unittest.cc b/components/invalidation/p2p_invalidator_unittest.cc
index 0ad7afc..a56dace 100644
--- a/components/invalidation/p2p_invalidator_unittest.cc
+++ b/components/invalidation/p2p_invalidator_unittest.cc
@@ -7,10 +7,10 @@
 #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 "jingle/notifier/listener/fake_push_client.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
diff --git a/components/invalidation/registration_manager.cc b/components/invalidation/registration_manager.cc
index 4d153a7..f0a1f93 100644
--- a/components/invalidation/registration_manager.cc
+++ b/components/invalidation/registration_manager.cc
@@ -12,9 +12,9 @@
 
 #include "base/rand_util.h"
 #include "base/stl_util.h"
+#include "components/invalidation/invalidation_util.h"
 #include "google/cacheinvalidation/include/invalidation-client.h"
 #include "google/cacheinvalidation/include/types.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/registration_manager.h b/components/invalidation/registration_manager.h
index 1bf77d5..00eb48e 100644
--- a/components/invalidation/registration_manager.h
+++ b/components/invalidation/registration_manager.h
@@ -16,9 +16,9 @@
 #include "base/timer/timer.h"
 // For invalidation::InvalidationListener::RegistrationState.
 #include "components/invalidation/invalidation_export.h"
+#include "components/invalidation/invalidation_util.h"
 #include "google/cacheinvalidation/include/invalidation-listener.h"
 #include "google/cacheinvalidation/include/types.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/registration_manager_unittest.cc b/components/invalidation/registration_manager_unittest.cc
index 9389e99..2afbd02 100644
--- a/components/invalidation/registration_manager_unittest.cc
+++ b/components/invalidation/registration_manager_unittest.cc
@@ -13,8 +13,8 @@
 #include "base/basictypes.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
+#include "components/invalidation/invalidation_util.h"
 #include "google/cacheinvalidation/include/invalidation-client.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
diff --git a/components/invalidation/single_object_invalidation_set.cc b/components/invalidation/single_object_invalidation_set.cc
index 6544489..c05c517 100644
--- a/components/invalidation/single_object_invalidation_set.cc
+++ b/components/invalidation/single_object_invalidation_set.cc
@@ -5,7 +5,7 @@
 #include "components/invalidation/single_object_invalidation_set.h"
 
 #include "base/values.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
+#include "components/invalidation/invalidation_util.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/single_object_invalidation_set.h b/components/invalidation/single_object_invalidation_set.h
index 11ab3e3..f424114 100644
--- a/components/invalidation/single_object_invalidation_set.h
+++ b/components/invalidation/single_object_invalidation_set.h
@@ -8,9 +8,9 @@
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
+#include "components/invalidation/invalidation.h"
 #include "components/invalidation/invalidation_export.h"
-#include "sync/internal_api/public/base/invalidation.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
+#include "components/invalidation/invalidation_util.h"
 
 namespace base {
 class ListValue;
diff --git a/components/invalidation/single_object_invalidation_set_unittest.cc b/components/invalidation/single_object_invalidation_set_unittest.cc
index 34172a1..aae71d0 100644
--- a/components/invalidation/single_object_invalidation_set_unittest.cc
+++ b/components/invalidation/single_object_invalidation_set_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "components/invalidation/single_object_invalidation_set.h"
 
+#include "components/invalidation/invalidation_test_util.h"
 #include "google/cacheinvalidation/types.pb.h"
-#include "sync/internal_api/public/base/invalidation_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
diff --git a/components/invalidation/sync_invalidation_listener.cc b/components/invalidation/sync_invalidation_listener.cc
index d15c606..a6566be 100644
--- a/components/invalidation/sync_invalidation_listener.cc
+++ b/components/invalidation/sync_invalidation_listener.cc
@@ -11,12 +11,12 @@
 #include "base/compiler_specific.h"
 #include "base/logging.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 "google/cacheinvalidation/include/invalidation-client.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "jingle/notifier/listener/push_client.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 
 namespace {
 
diff --git a/components/invalidation/sync_invalidation_listener.h b/components/invalidation/sync_invalidation_listener.h
index c2fe08c..647a04d 100644
--- a/components/invalidation/sync_invalidation_listener.h
+++ b/components/invalidation/sync_invalidation_listener.h
@@ -16,14 +16,14 @@
 #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 "google/cacheinvalidation/include/invalidation-listener.h"
-#include "sync/internal_api/public/base/ack_handler.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 
 namespace buzz {
diff --git a/components/invalidation/sync_invalidation_listener_unittest.cc b/components/invalidation/sync_invalidation_listener_unittest.cc
index 8f63cb2..339511e 100644
--- a/components/invalidation/sync_invalidation_listener_unittest.cc
+++ b/components/invalidation/sync_invalidation_listener_unittest.cc
@@ -12,6 +12,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.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"
@@ -19,7 +20,6 @@
 #include "google/cacheinvalidation/include/invalidation-client.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "jingle/notifier/listener/fake_push_client.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/invalidation/sync_system_resources.cc b/components/invalidation/sync_system_resources.cc
index 5685dea..04c5c77 100644
--- a/components/invalidation/sync_system_resources.cc
+++ b/components/invalidation/sync_system_resources.cc
@@ -16,11 +16,11 @@
 #include "base/strings/stringprintf.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 "google/cacheinvalidation/deps/callback.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "jingle/notifier/listener/push_client.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/sync_system_resources.h b/components/invalidation/sync_system_resources.h
index c0e8ec2..f576573 100644
--- a/components/invalidation/sync_system_resources.h
+++ b/components/invalidation/sync_system_resources.h
@@ -20,10 +20,10 @@
 #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 "google/cacheinvalidation/include/system-resources.h"
 #include "jingle/notifier/base/notifier_options.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
 
 namespace syncer {
 
diff --git a/components/invalidation/ticl_invalidation_service.cc b/components/invalidation/ticl_invalidation_service.cc
index 8a63af3..03dd30e 100644
--- a/components/invalidation/ticl_invalidation_service.cc
+++ b/components/invalidation/ticl_invalidation_service.cc
@@ -9,13 +9,13 @@
 #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 "google_apis/gaia/gaia_constants.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
 
 static const char* kOAuth2Scopes[] = {
   GaiaConstants::kGoogleTalkOAuth2Scope
diff --git a/components/invalidation/unacked_invalidation_set.cc b/components/invalidation/unacked_invalidation_set.cc
index 0d94a2f..b2d2e68 100644
--- a/components/invalidation/unacked_invalidation_set.cc
+++ b/components/invalidation/unacked_invalidation_set.cc
@@ -5,8 +5,8 @@
 #include "components/invalidation/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 "sync/internal_api/public/base/ack_handle.h"
 
 namespace {
 
diff --git a/components/invalidation/unacked_invalidation_set.h b/components/invalidation/unacked_invalidation_set.h
index 6dd2c46..7b9b729 100644
--- a/components/invalidation/unacked_invalidation_set.h
+++ b/components/invalidation/unacked_invalidation_set.h
@@ -5,11 +5,11 @@
 #ifndef COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_
 #define COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_
 
-#include <vector>
+#include <set>
 
+#include "components/invalidation/invalidation.h"
 #include "components/invalidation/invalidation_export.h"
-#include "sync/internal_api/public/base/invalidation.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
+#include "components/invalidation/invalidation_util.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 
 namespace base {
diff --git a/sync/internal_api/public/base/DEPS b/sync/internal_api/public/base/DEPS
index ef4f96b..fff1cc0 100644
--- a/sync/internal_api/public/base/DEPS
+++ b/sync/internal_api/public/base/DEPS
@@ -1,8 +1,4 @@
 include_rules = [
-  # Invalidations headers depend on this.  We should move them to sync/notifier
-  # then remove this rule.
-  "+google/cacheinvalidation",
-
   "-sync",
   "+sync/base",
   "+sync/internal_api/public/base",
diff --git a/sync/sync_internal_api.gypi b/sync/sync_internal_api.gypi
index cbef116..6e9429d 100644
--- a/sync/sync_internal_api.gypi
+++ b/sync/sync_internal_api.gypi
@@ -12,14 +12,9 @@
   'dependencies': [
     '../base/base.gyp:base',
     '../net/net.gyp:net',
-    '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
-    '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
     '../third_party/zlib/zlib.gyp:zlib',
     '../url/url.gyp:url_lib',
   ],
-  'export_dependent_settings': [
-    '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
-  ],
   'sources': [
     'internal_api/attachments/attachment_downloader_impl.cc',
     'internal_api/attachments/attachment_uploader_impl.cc',
@@ -57,10 +52,6 @@
     'internal_api/public/attachments/fake_attachment_downloader.h',
     'internal_api/public/attachments/fake_attachment_store.h',
     'internal_api/public/attachments/fake_attachment_uploader.h',
-    'internal_api/public/base/ack_handle.cc',
-    'internal_api/public/base/ack_handle.h',
-    'internal_api/public/base/ack_handler.cc',
-    'internal_api/public/base/ack_handler.h',
     'internal_api/public/base/attachment_id_proto.cc',
     'internal_api/public/base/attachment_id_proto.h',
     'internal_api/public/base/cancelation_observer.cc',
@@ -69,14 +60,8 @@
     'internal_api/public/base/cancelation_signal.h',
     'internal_api/public/base/enum_set.h',
     'internal_api/public/base/enum_set.h',
-    'internal_api/public/base/invalidation.cc',
-    'internal_api/public/base/invalidation.h',
     'internal_api/public/base/invalidation_interface.cc',
     'internal_api/public/base/invalidation_interface.h',
-    'internal_api/public/base/invalidation_util.cc',
-    'internal_api/public/base/invalidation_util.h',
-    'internal_api/public/base/invalidator_state.cc',
-    'internal_api/public/base/invalidator_state.h',
     'internal_api/public/base/model_type.h',
     'internal_api/public/base/node_ordinal.cc',
     'internal_api/public/base/node_ordinal.h',
diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi
index 9802ce3..20ec987 100644
--- a/sync/sync_tests.gypi
+++ b/sync/sync_tests.gypi
@@ -168,19 +168,15 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
-        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         'sync',
         'test_support_sync_core',
       ],
       'export_dependent_settings': [
         '../testing/gtest.gyp:gtest',
-        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         'sync',
         'test_support_sync_core',
       ],
       'sources': [
-        'internal_api/public/base/invalidation_test_util.cc',
-        'internal_api/public/base/invalidation_test_util.h',
         'internal_api/public/test/fake_sync_manager.h',
         'internal_api/public/test/null_sync_context_proxy.h',
         'internal_api/public/test/sync_manager_factory_for_profile_sync_test.h',
diff --git a/sync/tools/invalidation_helper.h b/sync/tools/invalidation_helper.h
index 9d45253..455998d 100644
--- a/sync/tools/invalidation_helper.h
+++ b/sync/tools/invalidation_helper.h
@@ -5,8 +5,8 @@
 #ifndef SYNC_TOOLS_INVALIDATION_HELPER_H_
 #define SYNC_TOOLS_INVALIDATION_HELPER_H_
 
+#include "components/invalidation/invalidation_util.h"
 #include "google/cacheinvalidation/include/types.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 #include "sync/internal_api/public/base/model_type.h"
 
 namespace syncer {
diff --git a/sync/tools/null_invalidation_state_tracker.cc b/sync/tools/null_invalidation_state_tracker.cc
index 24e8655..49d1af3 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 "sync/internal_api/public/base/invalidation_util.h"
+#include "components/invalidation/invalidation_util.h"
 
 namespace syncer {
 
diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc
index a7fb571..adbf4af 100644
--- a/sync/tools/sync_listen_notifications.cc
+++ b/sync/tools/sync_listen_notifications.cc
@@ -17,6 +17,7 @@
 #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"
@@ -27,7 +28,6 @@
 #include "net/dns/host_resolver.h"
 #include "net/http/transport_security_state.h"
 #include "net/url_request/url_request_test_util.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/tools/invalidation_helper.h"
 #include "sync/tools/null_invalidation_state_tracker.h"