Retry: Move some sync/notifier to components/invalidation

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 54fa78a39f4bd3e36015edd12723dc51edf22667..072920d91126bc58f583bdccceccd048f5c9493e 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -256,6 +256,7 @@
 
             # Dependencies of invalidation
             'components.gyp:invalidation',
+            'components.gyp:invalidation_test_support',
 
             # Dependencies of json_schema
             'components.gyp:json_schema',
@@ -463,6 +464,19 @@
                 '../third_party/libusb/libusb.gyp:libusb',
               ],
             }],
+            ['OS != "android"', {
+              'sources': [
+                'invalidation/fake_invalidator_unittest.cc',
+                'invalidation/gcm_network_channel_unittest.cc',
+                'invalidation/invalidation_notifier_unittest.cc',
+                'invalidation/invalidator_registrar_unittest.cc',
+                'invalidation/non_blocking_invalidator_unittest.cc',
+                'invalidation/p2p_invalidator_unittest.cc',
+                'invalidation/push_client_channel_unittest.cc',
+                'invalidation/sync_invalidation_listener_unittest.cc',
+                'invalidation/sync_system_resources_unittest.cc',
+              ],
+            }],
             ['chromeos==1', {
               'sources': [
                 'metrics/chromeos/serialization_utils_unittest.cc',