Refactor common invalidation framework types

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 93 matching lines @@
         '../testing/gmock.gyp:gmock',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
         'sync',
       ],
       'export_dependent_settings': [
         '../testing/gmock.gyp:gmock',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
         'sync',
       ],
       'sources': [
+        'notifier/fake_invalidation_handler.cc',
+        'notifier/fake_invalidation_handler.h',
         'notifier/fake_invalidation_state_tracker.cc',
         'notifier/fake_invalidation_state_tracker.h',
         'notifier/fake_invalidator.cc',
         'notifier/fake_invalidator.h',
-        'notifier/fake_invalidation_handler.cc',
-        'notifier/fake_invalidation_handler.h',
         'notifier/invalidator_test_template.cc',
         'notifier/invalidator_test_template.h',
-        'notifier/object_id_invalidation_map_test_util.cc',
-        'notifier/object_id_invalidation_map_test_util.h',
       ],
     },
 
     # Test support files for the 'sync_internal_api' target.
     {
       'target_name': 'test_support_sync_internal_api',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'include_dirs': [
         '..',
       ],
       'defines': [
         'SYNC_TEST'
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         'sync',
         'test_support_sync_core',
       ],
       'export_dependent_settings': [
         '../testing/gtest.gyp:gtest',
         'sync',
         'test_support_sync_core',
       ],
       'sources': [
         'internal_api/public/base/invalidation_test_util.cc',
         'internal_api/public/base/invalidation_test_util.h',
+        'internal_api/public/base/object_id_invalidation_map_test_util.cc',
+        'internal_api/public/base/object_id_invalidation_map_test_util.h',
         'internal_api/public/test/fake_sync_manager.h',
         'internal_api/public/test/test_entry_factory.h',
         'internal_api/public/test/test_internal_components_factory.h',
         'internal_api/public/test/test_user_share.h',
         'internal_api/test/fake_sync_manager.cc',
         'internal_api/test/test_entry_factory.cc',
         'internal_api/test/test_internal_components_factory.cc',
         'internal_api/test/test_user_share.cc',
       ],
     },
@@ skipping 162 matching lines @@
           '..',
         ],
         '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/object_id_invalidation_map_unittest.cc',
+              'notifier/single_object_invalidation_set_unittest.cc',
               'notifier/p2p_invalidator_unittest.cc',
               'notifier/push_client_channel_unittest.cc',
               'notifier/registration_manager_unittest.cc',
               'notifier/sync_invalidation_listener_unittest.cc',
               'notifier/sync_system_resources_unittest.cc',
             ],
           }],
         ],
       },
     },
@@ skipping 285 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' ],
         },
       ],
     }],
   ],
 }