Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

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_payload_map.h"
+#include "sync/internal_api/public/base/model_type_state_map.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/read_transaction.h"
 
 using sync_pb::DebugInfo;
 
 namespace syncer {
 using sessions::StatusController;
 using sessions::SyncSession;
 using std::string;
 
@@ skipping 41 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 ModelTypePayloadMap& type_payload_map = session->source().types;
+  const ModelTypeStateMap& type_state_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.
-    ModelTypePayloadMap::const_iterator type_payload =
-        type_payload_map.find(it.Get());
-    if (type_payload != type_payload_map.end()) {
-      progress_marker->set_notification_hint(type_payload->second);
+    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);
     }
   }
 
   bool need_encryption_key = false;
   if (session->context()->keystore_encryption_enabled()) {
     syncable::Directory* dir = session->context()->directory();
     syncable::ReadTransaction trans(FROM_HERE, dir);
     Cryptographer* cryptographer =
         session->context()->directory()->GetCryptographer(&trans);
     need_encryption_key = !cryptographer->HasKeystoreKey();
@@ skipping 61 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