Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/notifier/sync_invalidation_listener_unittest.cc

Index: sync/notifier/sync_invalidation_listener_unittest.cc
diff --git a/sync/notifier/sync_invalidation_listener_unittest.cc b/sync/notifier/sync_invalidation_listener_unittest.cc
index d17f9885de615bd4da10330842155919059624cf..a335060cbfed4e27bde760a14e0fcb55095634ea 100644
--- a/sync/notifier/sync_invalidation_listener_unittest.cc
+++ b/sync/notifier/sync_invalidation_listener_unittest.cc
@@ -140,8 +140,8 @@ class FakeDelegate : public SyncInvalidationListener::Delegate {
   }
 
   std::string GetPayload(const ObjectId& id) const {
-    ObjectIdStateMap::const_iterator it = states_.find(id);
-    return (it == states_.end()) ? "" : it->second.payload;
+    ObjectIdInvalidationMap::const_iterator it = invalidations_.find(id);
+    return (it == invalidations_.end()) ? "" : it->second.payload;
   }
 
   InvalidatorState GetInvalidatorState() const {
@@ -150,11 +150,12 @@ class FakeDelegate : public SyncInvalidationListener::Delegate {
 
   // SyncInvalidationListener::Delegate implementation.
 
-  virtual void OnInvalidate(const ObjectIdStateMap& id_state_map) OVERRIDE {
-    for (ObjectIdStateMap::const_iterator it = id_state_map.begin();
-         it != id_state_map.end(); ++it) {
+  virtual void OnInvalidate(
+      const ObjectIdInvalidationMap& invalidation_map) OVERRIDE {
+    for (ObjectIdInvalidationMap::const_iterator it = invalidation_map.begin();
+         it != invalidation_map.end(); ++it) {
       ++invalidation_counts_[it->first];
-      states_[it->first] = it->second;
+      invalidations_[it->first] = it->second;
     }
   }
 
@@ -165,7 +166,7 @@ class FakeDelegate : public SyncInvalidationListener::Delegate {
  private:
   typedef std::map<ObjectId, int, ObjectIdLessThan> ObjectIdCountMap;
   ObjectIdCountMap invalidation_counts_;
-  ObjectIdStateMap states_;
+  ObjectIdInvalidationMap invalidations_;
   InvalidatorState state_;
 };