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

sync/sync_tests.gypi

 # Copyright 2013 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': [
     # Test support files for the 'sync_core' target.
     {
       'target_name': 'test_support_sync_core',
       'type': 'static_library',
@@ skipping 310 matching lines @@
         '../testing/gtest.gyp:gtest',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         '../third_party/libjingle/libjingle.gyp:libjingle',
         'sync',
         'test_support_sync_notifier',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
+        'sources': [
+          'notifier/invalidator_factory_unittest.cc',
+        ],
         'conditions': [
           ['OS != "android"', {
             'sources': [
               'notifier/ack_tracker_unittest.cc',
               'notifier/fake_invalidator_unittest.cc',
               'notifier/invalidation_notifier_unittest.cc',
               'notifier/invalidator_registrar_unittest.cc',
               'notifier/non_blocking_invalidator_unittest.cc',
               'notifier/p2p_invalidator_unittest.cc',
               'notifier/push_client_channel_unittest.cc',
@@ skipping 294 matching lines @@
           'variables': {
             'test_suite_name': 'sync_unit_tests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sync_unit_tests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }