Move sync/notifier to components/invalidation

components/invalidation.gypi

Index: components/invalidation.gypi
diff --git a/components/invalidation.gypi b/components/invalidation.gypi
index 8759451261e01066057d67a737b224f57c6a9f99..769e26910ff3b0ce3f4c139099cbf51b40d88288 100644
--- a/components/invalidation.gypi
+++ b/components/invalidation.gypi
@@ -14,16 +14,23 @@
         '../jingle/jingle.gyp:notifier',
         '../sync/sync.gyp:sync',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+        # TODO(akalin): Remove this (http://crbug.com/133352).
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
         'gcm_driver',
         'keyed_service_core',
         'pref_registry',
         'signin_core_browser',
       ],
+      'export_dependent_settings': [
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+      ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
+        'invalidation/invalidation_handler.cc',
+        'invalidation/invalidation_handler.h',
         'invalidation/invalidation_logger.cc',
         'invalidation/invalidation_logger.h',
         'invalidation/invalidation_logger_observer.h',
@@ -32,14 +39,26 @@
         '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/invalidator.cc',
+        'invalidation/invalidator.h',
         'invalidation/invalidator_registrar.cc',
         'invalidation/invalidator_registrar.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',
       ],
       'conditions': [
           ['OS != "android"', {
@@ -60,6 +79,8 @@
               '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',
@@ -85,7 +106,6 @@
         '../jingle/jingle.gyp:notifier_test_util',
         '../net/net.gyp:net',
         '../sync/sync.gyp:sync',
-        '../sync/sync.gyp:test_support_sync_notifier',
         '../testing/gmock.gyp:gmock',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         'gcm_driver_test_support',
@@ -106,6 +126,10 @@
         'invalidation/invalidation_service_test_template.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',
       ],
       'conditions': [
           ['OS != "android"', {