Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/engine/download_updates_command.cc

Index: sync/engine/download_updates_command.cc
diff --git a/sync/engine/download_updates_command.cc b/sync/engine/download_updates_command.cc
index 50ad8a0d53430490aca8637967f21bbab9f4cdac..d2b34ed66bc5347f82f5df2029fc7d9c1f0870bd 100644
--- a/sync/engine/download_updates_command.cc
+++ b/sync/engine/download_updates_command.cc
@@ -9,7 +9,7 @@
 #include "base/command_line.h"
 #include "sync/engine/syncer.h"
 #include "sync/engine/syncer_proto_util.h"
-#include "sync/internal_api/public/base/model_type_state_map.h"
+#include "sync/internal_api/public/base/model_type_invalidation_map.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/nigori_handler.h"
 #include "sync/syncable/read_transaction.h"
@@ -73,7 +73,8 @@ SyncerError DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) {
            << ModelTypeSetToString(enabled_types);
   DCHECK(!enabled_types.Empty());
 
-  const ModelTypeStateMap& type_state_map = session->source().types;
+  const ModelTypeInvalidationMap& invalidation_map =
+      session->source().types;
   for (ModelTypeSet::Iterator it = enabled_types.First();
        it.Good(); it.Inc()) {
     sync_pb::DataTypeProgressMarker* progress_marker =
@@ -81,10 +82,10 @@ SyncerError DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) {
     dir->GetDownloadProgress(it.Get(), progress_marker);
 
     // Set notification hint if present.
-    ModelTypeStateMap::const_iterator type_state =
-        type_state_map.find(it.Get());
-    if (type_state != type_state_map.end()) {
-      progress_marker->set_notification_hint(type_state->second.payload);
+    ModelTypeInvalidationMap::const_iterator invalidation =

[akalin, 2012/10/04 00:55:31]

maybe it2?

[dcheng, 2012/10/04 01:12:30]

Done. (I used find_it since I find it/it2 to be a little too close together)

+        invalidation_map.find(it.Get());
+    if (invalidation != invalidation_map.end()) {
+      progress_marker->set_notification_hint(invalidation->second.payload);
     }
   }