Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/internal_api/public/base/invalidation.cc

Index: sync/internal_api/public/base/invalidation.cc
diff --git a/sync/internal_api/public/base/invalidation_state.cc b/sync/internal_api/public/base/invalidation.cc
similarity index 77%
rename from sync/internal_api/public/base/invalidation_state.cc
rename to sync/internal_api/public/base/invalidation.cc
index 6f71351ecda9da6a3c7a6e10e2901acfc7d2a985..2ddaa63adea9d3fa91ea5afa4c01c12bd73826a4 100644
--- a/sync/internal_api/public/base/invalidation_state.cc
+++ b/sync/internal_api/public/base/invalidation.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sync/internal_api/public/base/invalidation_state.h"
+#include "sync/internal_api/public/base/invalidation.h"
 
 #include "base/values.h"
 
@@ -20,18 +20,18 @@ bool AckHandle::ResetFromValue(const base::Value& value) {
   return true;
 }
 
-bool InvalidationState::Equals(const InvalidationState& other) const {
+bool Invalidation::Equals(const Invalidation& other) const {
   return (payload == other.payload) && ack_handle.Equals(other.ack_handle);
 }
 
-scoped_ptr<base::DictionaryValue> InvalidationState::ToValue() const {
+scoped_ptr<base::DictionaryValue> Invalidation::ToValue() const {
   scoped_ptr<DictionaryValue> value(new DictionaryValue());
   value->SetString("payload", payload);
   value->Set("ackHandle", ack_handle.ToValue().release());
   return value.Pass();
 }
 
-bool InvalidationState::ResetFromValue(const base::DictionaryValue& value) {
+bool Invalidation::ResetFromValue(const base::DictionaryValue& value) {
   const base::Value* ack_handle_value = NULL;
   return
       value.GetString("payload", &payload) &&