Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/notifier/object_id_invalidation_map_test_util.h

Index: sync/notifier/object_id_invalidation_map_test_util.h
diff --git a/sync/notifier/object_id_state_map_test_util.h b/sync/notifier/object_id_invalidation_map_test_util.h
similarity index 44%
rename from sync/notifier/object_id_state_map_test_util.h
rename to sync/notifier/object_id_invalidation_map_test_util.h
index 7b26b93c63b81d74d0f3a8a315b836053ff377a2..47d03e9680a5e8e2a620309b10dd264749f9f48d 100644
--- a/sync/notifier/object_id_state_map_test_util.h
+++ b/sync/notifier/object_id_invalidation_map_test_util.h
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_NOTIFIER_OBJECT_ID_STATE_MAP_TEST_UTILH_
-#define SYNC_NOTIFIER_OBJECT_ID_STATE_MAP_TEST_UTILH_
+#ifndef SYNC_NOTIFIER_OBJECT_ID_INVALIDATION_MAP_TEST_UTILH_
+#define SYNC_NOTIFIER_OBJECT_ID_INVALIDATION_MAP_TEST_UTILH_
 
 // Convince googletest to use the correct overload for PrintTo().
-#include "sync/internal_api/public/base/invalidation_state_test_util.h"
-#include "sync/notifier/object_id_state_map.h"
+#include "sync/internal_api/public/base/invalidation_test_util.h"
+#include "sync/notifier/object_id_invalidation_map.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace syncer {
 
-::testing::Matcher<const ObjectIdStateMap&> Eq(
-    const ObjectIdStateMap& expected);
+::testing::Matcher<const ObjectIdInvalidationMap&> Eq(
+    const ObjectIdInvalidationMap& expected);
 
 }  // namespace syncer
 
-#endif  // SYNC_NOTIFIER_OBJECT_ID_STATE_MAP_TEST_UTILH_
+#endif  // SYNC_NOTIFIER_OBJECT_ID_INVALIDATION_MAP_TEST_UTILH_