Merge 208347 "Revert 208315 "Make use of InvalidationService""

chrome/chrome_tests_unit.gypi

 # 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.
 {
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
@@ skipping 913 matching lines @@
         'browser/importer/firefox_importer_unittest_utils.h',
         'browser/importer/firefox_importer_unittest_utils_mac.cc',
         'browser/importer/firefox_importer_utils_unittest.cc',
         'browser/importer/firefox_profile_lock_unittest.cc',
         'browser/importer/firefox_proxy_settings_unittest.cc',
         'browser/importer/ie_importer_unittest_win.cc',
         'browser/importer/profile_writer_unittest.cc',
         'browser/importer/safari_importer_unittest.mm',
         'browser/importer/toolbar_importer_unittest.cc',
         'browser/internal_auth_unittest.cc',
+        'browser/invalidation/invalidation_frontend_test_template.cc',
+        'browser/invalidation/invalidation_frontend_test_template.h',
         'browser/invalidation/invalidation_service_android_unittest.cc',
-        'browser/invalidation/invalidation_service_test_template.cc',
-        'browser/invalidation/invalidation_service_test_template.h',
         'browser/invalidation/invalidator_storage_unittest.cc',
         'browser/invalidation/ticl_invalidation_service_unittest.cc',
         'browser/language_usage_metrics_unittest.cc',
         'browser/mac/keystone_glue_unittest.mm',
         'browser/managed_mode/managed_mode_unittest.cc',
         'browser/managed_mode/managed_mode_url_filter_unittest.cc',
         'browser/managed_mode/managed_user_registration_service_unittest.cc',
         'browser/managed_mode/managed_user_service_unittest.cc',
         'browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc',
         'browser/media_galleries/fileapi/itunes_library_parser_unittest.cc',
@@ skipping 239 matching lines @@
         'browser/storage_monitor/test_portable_device_watcher_win.cc',
         'browser/storage_monitor/test_portable_device_watcher_win.h',
         'browser/storage_monitor/test_storage_monitor_win.cc',
         'browser/storage_monitor/test_storage_monitor_win.h',
         'browser/storage_monitor/test_volume_mount_watcher_win.cc',
         'browser/storage_monitor/test_volume_mount_watcher_win.h',
         'browser/sync/about_sync_util_unittest.cc',
         'browser/sync/abstract_profile_sync_service_test.cc',
         'browser/sync/abstract_profile_sync_service_test.h',
         'browser/sync/backend_migrator_unittest.cc',
+        'browser/sync/glue/android_invalidator_bridge_proxy_unittest.cc',
+        'browser/sync/glue/android_invalidator_bridge_unittest.cc',
         'browser/sync/glue/autofill_data_type_controller_unittest.cc',
         'browser/sync/glue/bookmark_data_type_controller_unittest.cc',
         'browser/sync/glue/browser_thread_model_worker_unittest.cc',
         'browser/sync/glue/change_processor_mock.cc',
         'browser/sync/glue/change_processor_mock.h',
         'browser/sync/glue/chrome_encryptor_unittest.cc',
         'browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc',
         'browser/sync/glue/data_type_controller_mock.cc',
         'browser/sync/glue/data_type_controller_mock.h',
         'browser/sync/glue/data_type_error_handler_mock.cc',
@@ skipping 1378 matching lines @@
               # more details.
               'DebugInformationFormat': '3',
               'ProgramDataBaseFileName': '<(PRODUCT_DIR)/unit_tests.exe.pdb',
             },
           },
         },
       ],
     }],
   ],  # 'conditions'
 }