Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/sync.gyp

Index: sync/sync.gyp
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 96ccfcc363d25698e6c0b534df69ddda0b82c605..4358eedc4ef1e0c0a382060673c8dcdc5e1841a1 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -42,11 +42,11 @@
       '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/invalidation.cc',
+        'internal_api/public/base/invalidation.h',
         'internal_api/public/base/model_type.h',
-        'internal_api/public/base/model_type_state_map.cc',
-        'internal_api/public/base/model_type_state_map.h',
+        'internal_api/public/base/model_type_invalidation_map.cc',
+        'internal_api/public/base/model_type_invalidation_map.h',
         'internal_api/public/base/node_ordinal.cc',
         'internal_api/public/base/node_ordinal.h',
         'internal_api/public/base/ordinal.h',
@@ -272,8 +272,8 @@
         'notifier/invalidator_registrar.h',
         'notifier/invalidator_state.cc',
         'notifier/invalidator_state.h',
-        'notifier/object_id_state_map.cc',
-        'notifier/object_id_state_map.h',
+        'notifier/object_id_invalidation_map.cc',
+        'notifier/object_id_invalidation_map.h',
       ],
       'conditions': [
         ['OS != "android"', {
@@ -428,10 +428,10 @@
         '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/invalidation_test_util.cc',
+        'internal_api/public/base/invalidation_test_util.h',
+        'internal_api/public/base/model_type_invalidation_map_test_util.cc',
+        'internal_api/public/base/model_type_invalidation_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',
@@ -498,8 +498,8 @@
         'notifier/fake_invalidation_handler.h',
         'notifier/invalidator_test_template.cc',
         'notifier/invalidator_test_template.h',
-        'notifier/object_id_state_map_test_util.cc',
-        'notifier/object_id_state_map_test_util.h',
+        'notifier/object_id_invalidation_map_test_util.cc',
+        'notifier/object_id_invalidation_map_test_util.h',
       ],
     },
 
@@ -592,7 +592,7 @@
         ],
         'sources': [
           'internal_api/public/base/enum_set_unittest.cc',
-          'internal_api/public/base/model_type_state_map_unittest.cc',
+          'internal_api/public/base/model_type_invalidation_map_unittest.cc',
           'internal_api/public/base/node_ordinal_unittest.cc',
           'internal_api/public/base/ordinal_unittest.cc',
           'internal_api/public/engine/model_safe_worker_unittest.cc',