Rename ModelType/ObjectIdStateMap to InvalidationMap.

chrome/browser/sync/glue/bridged_invalidator_unittest.cc

Index: chrome/browser/sync/glue/bridged_invalidator_unittest.cc
diff --git a/chrome/browser/sync/glue/bridged_invalidator_unittest.cc b/chrome/browser/sync/glue/bridged_invalidator_unittest.cc
index ecd8084d6e12dcaa1be5ffbf7a1b5e18fee22756..966f387eb0835e9efb8b9bd3a7b579fc5b72d279 100644
--- a/chrome/browser/sync/glue/bridged_invalidator_unittest.cc
+++ b/chrome/browser/sync/glue/bridged_invalidator_unittest.cc
@@ -19,7 +19,7 @@
 #include "sync/notifier/fake_invalidation_handler.h"
 #include "sync/notifier/fake_invalidator.h"
 #include "sync/notifier/invalidator_test_template.h"
-#include "sync/notifier/object_id_state_map_test_util.h"
+#include "sync/notifier/object_id_invalidation_map_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -84,9 +84,9 @@ class BridgedInvalidatorTestDelegate {
   }
 
   void TriggerOnIncomingInvalidation(
-      const syncer::ObjectIdStateMap& id_state_map,
+      const syncer::ObjectIdInvalidationMap& invalidation_map,
       syncer::IncomingInvalidationSource source) {
-    fake_delegate_->EmitOnIncomingInvalidation(id_state_map, source);
+    fake_delegate_->EmitOnIncomingInvalidation(invalidation_map, source);
   }
 
   static bool InvalidatorHandlesDeprecatedState() {
@@ -170,11 +170,11 @@ TEST_F(BridgedInvalidatorTest, SendInvalidation) {
   syncer::ObjectIdSet ids;
   ids.insert(invalidation::ObjectId(1, "id1"));
   ids.insert(invalidation::ObjectId(2, "id2"));
-  const syncer::ObjectIdStateMap& id_state_map =
-      syncer::ObjectIdSetToStateMap(ids, "payload");
-  delegate_.GetInvalidator()->SendInvalidation(id_state_map);
-  EXPECT_THAT(id_state_map,
-              Eq(delegate_.GetFakeDelegate()->GetLastSentIdStateMap()));
+  const syncer::ObjectIdInvalidationMap& invalidation_map =
+      syncer::ObjectIdSetToInvalidationMap(ids, "payload");
+  delegate_.GetInvalidator()->SendInvalidation(invalidation_map);
+  EXPECT_THAT(invalidation_map,
+              Eq(delegate_.GetFakeDelegate()->GetLastSentInvalidationMap()));
 }
 
 }  // namespace