Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/sync.gyp

 # Copyright (c) 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': {
     'chromium_code': 1,
   },
   'targets': [
     # The core sync library.
@@ skipping 23 matching lines @@
         'protocol/sync_proto.gyp:sync_proto',
       ],
       'export_dependent_settings': [
         # Propagate sync_proto since our headers include its generated
         # files.
         'protocol/sync_proto.gyp:sync_proto',
       ],
       'sources': [
         'base/sync_export.h',
         'internal_api/public/base/enum_set.h',
+        'internal_api/public/base/invalidation_state.h',
         'internal_api/public/base/model_type.h',
-        'internal_api/public/base/model_type_payload_map.cc',
-        'internal_api/public/base/model_type_payload_map.h',
+        'internal_api/public/base/model_type_state_map.cc',
+        'internal_api/public/base/model_type_state_map.h',
         'internal_api/public/engine/model_safe_worker.cc',
         'internal_api/public/engine/model_safe_worker.h',
         'internal_api/public/engine/passive_model_worker.cc',
         'internal_api/public/engine/passive_model_worker.h',
         'internal_api/public/engine/polling_constants.cc',
         'internal_api/public/engine/polling_constants.h',
         'internal_api/public/engine/sync_status.cc',
         'internal_api/public/engine/sync_status.h',
         'internal_api/public/sessions/model_neutral_state.cc',
         'internal_api/public/sessions/model_neutral_state.h',
@@ skipping 192 matching lines @@
       ],
       'export_dependent_settings': [
         '../jingle/jingle.gyp:notifier',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
       ],
       'sources': [
         'notifier/invalidation_util.cc',
         'notifier/invalidation_util.h',
         'notifier/notifications_disabled_reason.cc',
         'notifier/notifications_disabled_reason.h',
-        'notifier/object_id_payload_map.cc',
-        'notifier/object_id_payload_map.h',
+        'notifier/object_id_state_map.cc',
+        'notifier/object_id_state_map.h',
         'notifier/sync_notifier.h',
         'notifier/sync_notifier_factory.cc',
         'notifier/sync_notifier_factory.h',
         'notifier/sync_notifier_observer.h',
         'notifier/sync_notifier_registrar.cc',
         'notifier/sync_notifier_registrar.h',
       ],
       'conditions': [
         ['OS != "android"', {
           'sources': [
@@ skipping 138 matching lines @@
         'protocol/sync_proto.gyp:sync_proto',
         'sync',
       ],
       'export_dependent_settings': [
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         'protocol/sync_proto.gyp:sync_proto',
         'sync',
       ],
       'sources': [
+        'internal_api/public/base/invalidation_state_test_util.cc',
+        'internal_api/public/base/invalidation_state_test_util.h',
+        'internal_api/public/base/model_type_state_map_test_util.cc',
+        'internal_api/public/base/model_type_state_map_test_util.h',
         'internal_api/public/base/model_type_test_util.cc',
         'internal_api/public/base/model_type_test_util.h',
         'js/js_test_util.cc',
         'js/js_test_util.h',
         'sessions/test_util.cc',
         'sessions/test_util.h',
         'syncable/syncable_mock.cc',
         'syncable/syncable_mock.h',
         'test/callback_counter.h',
         'test/engine/fake_model_worker.cc',
@@ skipping 41 matching lines @@
       ],
       'export_dependent_settings': [
         '../testing/gmock.gyp:gmock',
         'sync_notifier',
       ],
       'sources': [
         'notifier/fake_invalidation_state_tracker.cc',
         'notifier/fake_invalidation_state_tracker.h',
         'notifier/mock_sync_notifier_observer.cc',
         'notifier/mock_sync_notifier_observer.h',
+        'notifier/object_id_state_map_test_util.cc',
+        'notifier/object_id_state_map_test_util.h',
       ],
     },
 
     # Test support files for the 'syncapi_core' target.
     {
       'target_name': 'test_support_syncapi_core',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'include_dirs': [
         '..',
@@ skipping 73 matching lines @@
         'sync',
         'test_support_sync',
       ],
       'direct_dependent_settings': {
         'variables': { 'enable_wexit_time_destructors': 1, },
         'include_dirs': [
           '..',
         ],
         'sources': [
           'internal_api/public/base/enum_set_unittest.cc',
-          'internal_api/public/base/model_type_payload_map_unittest.cc',
+          'internal_api/public/base/model_type_state_map_unittest.cc',
           'internal_api/public/engine/model_safe_worker_unittest.cc',
           'internal_api/public/util/immutable_unittest.cc',
           'engine/apply_updates_command_unittest.cc',
           'engine/backoff_delay_provider_unittest.cc',
           'engine/build_commit_command_unittest.cc',
           'engine/download_updates_command_unittest.cc',
           'engine/model_changing_syncer_command_unittest.cc',
           'engine/process_commit_response_command_unittest.cc',
           'engine/process_updates_command_unittest.cc',
           'engine/resolve_conflicts_command_unittest.cc',
@@ skipping 271 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' ],
         },
       ],
     }],
   ],
 }