Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/internal_api/public/base/invalidation_test_util.h

Index: sync/internal_api/public/base/invalidation_test_util.h
diff --git a/sync/internal_api/public/base/invalidation_state_test_util.h b/sync/internal_api/public/base/invalidation_test_util.h
similarity index 41%
rename from sync/internal_api/public/base/invalidation_state_test_util.h
rename to sync/internal_api/public/base/invalidation_test_util.h
index 77baccb62521e608484fdc94dd7ba566dbcdda6b..694081d3fb35f036100467d02dcfd418efbdcba8 100644
--- a/sync/internal_api/public/base/invalidation_state_test_util.h
+++ b/sync/internal_api/public/base/invalidation_test_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_STATE_TEST_UTIL_H_
-#define SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_STATE_TEST_UTIL_H_
+#ifndef SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_TEST_UTIL_H_
+#define SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_TEST_UTIL_H_
 
 #include <iosfwd>
 
@@ -11,13 +11,12 @@
 
 namespace syncer {
 
-struct InvalidationState;
+struct Invalidation;
 
-void PrintTo(const InvalidationState& state, ::std::ostream* os);
+void PrintTo(const Invalidation& invalidation, ::std::ostream* os);
 
-::testing::Matcher<const InvalidationState&> Eq(
-    const InvalidationState& expected);
+::testing::Matcher<const Invalidation&> Eq(const Invalidation& expected);
 
 }  // namespace syncer
 
-#endif  // SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_STATE_TEST_UTIL_H_
+#endif  // SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_TEST_UTIL_H_