Revert of 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 319d381391bdc66912672304f0916803411da2d0..56dd758db26c4a7a06a91739e11b5f1b6b77949a 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -254,7 +254,6 @@
 
             # Dependencies of invalidation
             'components.gyp:invalidation',
-            'components.gyp:invalidation_test_support',
 
             # Dependencies of json_schema
             'components.gyp:json_schema',
@@ -459,19 +458,6 @@
                 'components.gyp:web_modal',
                 'components.gyp:web_modal_test_support',
                 '../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', {