Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/engine/download_updates_command.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/engine/download_updates_command.h"
 
 #include <string>
 
 #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"
 
 using sync_pb::DebugInfo;
 
 namespace syncer {
 using sessions::StatusController;
 using sessions::SyncSession;
 using std::string;
@@ skipping 43 matching lines @@
 
   syncable::Directory* dir = session->context()->directory();
 
   // Request updates for all enabled types.
   const ModelTypeSet enabled_types =
       GetRoutingInfoTypes(session->routing_info());
   DVLOG(1) << "Getting updates for types "
            << 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 =
         get_updates->add_from_progress_marker();
     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);
     }
   }
 
   bool need_encryption_key = false;
   if (session->context()->keystore_encryption_enabled()) {
     syncable::Directory* dir = session->context()->directory();
     syncable::ReadTransaction trans(FROM_HERE, dir);
     syncable::NigoriHandler* nigori_handler = dir->GetNigoriHandler();
     need_encryption_key = nigori_handler->NeedKeystoreKey(&trans);
     get_updates->set_need_encryption_key(need_encryption_key);
@@ skipping 57 matching lines @@
     // could be null in some unit tests.
     if (session->context()->debug_info_getter()) {
       session->context()->debug_info_getter()->GetAndClearDebugInfo(
           debug_info);
     }
     session->mutable_status_controller()->set_debug_info_sent();
   }
 }
 
 }  // namespace syncer