Move some sync/notifier to components/invalidation

components/invalidation.gypi

Index: components/invalidation.gypi
diff --git a/components/invalidation.gypi b/components/invalidation.gypi
index e6fae99c74df9dfa1d915d71e67a9608cd6ea86b..fc39383c7a89aafc65ce251fb201c2d1352074fb 100644
--- a/components/invalidation.gypi
+++ b/components/invalidation.gypi
@@ -9,9 +9,10 @@
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
+        '../google_apis/google_apis.gyp:google_apis',
+        '../jingle/jingle.gyp:notifier',
         '../sync/sync.gyp:sync',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
-        '../jingle/jingle.gyp:notifier',
         'keyed_service_core',
         'pref_registry',
       ],
@@ -29,11 +30,37 @@
         'invalidation/invalidation_service_util.h',
         'invalidation/invalidation_switches.cc',
         'invalidation/invalidation_switches.h',
+        'invalidation/invalidator_registrar.cc',
+        'invalidation/invalidator_registrar.h',
         'invalidation/invalidator_storage.cc',
         'invalidation/invalidator_storage.h',
         'invalidation/ticl_settings_provider.cc',
         'invalidation/ticl_settings_provider.h',
       ],
+      'conditions': [
+          ['OS != "android"', {
+            'sources': [
+              '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/state_writer.h',
+              'invalidation/sync_invalidation_listener.cc',
+              'invalidation/sync_invalidation_listener.h',
+              'invalidation/sync_system_resources.cc',
+              'invalidation/sync_system_resources.h',
+            ],
+          }],
+      ],
     },
 
     {
@@ -43,8 +70,11 @@
         '../base/base.gyp:base',
         '../google_apis/google_apis.gyp:google_apis',
         '../jingle/jingle.gyp:notifier',
+        '../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',
         'keyed_service_core',
       ],
@@ -52,8 +82,22 @@
         '..',
       ],
       'sources': [
-        'invalidation/p2p_invalidation_service.cc',
-        'invalidation/p2p_invalidation_service.h',
+        '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/invalidator_test_template.cc',
+        'invalidation/invalidator_test_template.h',
+      ],
+      'conditions': [
+          ['OS != "android"', {
+            'sources': [
+              'invalidation/p2p_invalidation_service.cc',
+              'invalidation/p2p_invalidation_service.h',
+            ],
+          }],
       ],
     },
   ],