Revert of Move some sync/notifier to components/invalidation

components/components_tests.gyp

 # Copyright 2012 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.
 
 {
   'variables': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 236 matching lines @@
 
             # Dependencies of feedback
             'components.gyp:feedback_component',
             
             # Dependencies of gcm
             'components.gyp:gcm_driver',
             'components.gyp:gcm_driver_test_support',
 
             # Dependencies of invalidation
             'components.gyp:invalidation',
-            'components.gyp:invalidation_test_support',
 
             # Dependencies of json_schema
             'components.gyp:json_schema',
 
             # Dependencies of keyed_service
             'components.gyp:keyed_service_core',
 
             # Dependencies of language_usage_metrics
             'components.gyp:language_usage_metrics',
 
@@ skipping 186 matching lines @@
               'dependencies!': [
                 'components.gyp:feedback_component',
                 'components.gyp:storage_monitor',
                 'components.gyp:storage_monitor_test_support',
                 'components.gyp:usb_service',
                 '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', {
               'sources': [
                 'metrics/chromeos/serialization_utils_unittest.cc',
               ],
               'sources!': [
                 'storage_monitor/storage_monitor_linux_unittest.cc',
               ],
               'dependencies': [
                 '../chromeos/chromeos.gyp:chromeos_test_support',
                 'components.gyp:metrics_chromeos',
@@ skipping 256 matching lines @@
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }