[Sync] Rework Invalidator-related unit tests

sync/sync.gyp

Index: sync/sync.gyp
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 369605b2bb6e0988337caaca0a79518f2ccbe080..1c81708cf83e9deae2bbbe903855304d9063a811 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -41,6 +41,7 @@
       'sources': [
         'base/sync_export.h',
         'internal_api/public/base/enum_set.h',
+        'internal_api/public/base/invalidation_state.cc',
         'internal_api/public/base/invalidation_state.h',
         'internal_api/public/base/model_type.h',
         'internal_api/public/base/model_type_state_map.cc',
@@ -486,6 +487,7 @@
         'notifier/fake_invalidation_handler.h',
         'notifier/object_id_state_map_test_util.cc',
         'notifier/object_id_state_map_test_util.h',
+        'notifier/invalidator_test_template.h',

[Nicolas Zea, 2012/08/29 23:41:05]

abc order

[akalin, 2012/08/30 22:20:38]

Done.

       ],
     },
 
@@ -573,7 +575,6 @@
         'test_support_sync',
       ],
       'direct_dependent_settings': {
-        'variables': { 'enable_wexit_time_destructors': 1, },
         'include_dirs': [
           '..',
         ],
@@ -659,7 +660,6 @@
         'test_support_sync_notifier',
       ],
       'direct_dependent_settings': {
-        'variables': { 'enable_wexit_time_destructors': 1, },
         'include_dirs': [
           '..',
         ],
@@ -671,6 +671,7 @@
             'sources': [
               'notifier/chrome_invalidation_client_unittest.cc',
               'notifier/chrome_system_resources_unittest.cc',
+              'notifier/fake_invalidator_unittest.cc',
               'notifier/invalidation_notifier_unittest.cc',
               'notifier/invalidator_registrar_unittest.cc',
               'notifier/non_blocking_invalidator_unittest.cc',
@@ -719,7 +720,6 @@
         'test_support_syncapi_core',
       ],
       'direct_dependent_settings': {
-        'variables': { 'enable_wexit_time_destructors': 1, },
         'include_dirs': [
           '..',
         ],
@@ -765,7 +765,6 @@
         'test_support_syncapi_service',
       ],
       'direct_dependent_settings': {
-        'variables': { 'enable_wexit_time_destructors': 1, },
         'include_dirs': [
           '..',
         ],
@@ -780,6 +779,8 @@
     {
       'target_name': 'sync_unit_tests',
       'type': '<(gtest_target_type)',
+      # Typed-parametrized tests generate exit-time destructors.
+      'variables': { 'enable_wexit_time_destructors': 0, },
       'dependencies': [
         '../base/base.gyp:run_all_unittests',
         'sync_tests',