Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/internal_api/public/engine/model_safe_worker.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/internal_api/public/engine/model_safe_worker.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 
@@ skipping 11 matching lines @@
 }
 
 std::string ModelSafeRoutingInfoToString(
     const ModelSafeRoutingInfo& routing_info) {
   scoped_ptr<DictionaryValue> dict(ModelSafeRoutingInfoToValue(routing_info));
   std::string json;
   base::JSONWriter::Write(dict.get(), &json);
   return json;
 }
 
-ModelTypePayloadMap ModelSafeRoutingInfoToPayloadMap(
+ModelTypeStateMap ModelSafeRoutingInfoToStateMap(
     const ModelSafeRoutingInfo& routes,
     const std::string& payload) {
-  ModelTypePayloadMap types_with_payloads;
+  ModelTypeStateMap type_state_map;
   for (ModelSafeRoutingInfo::const_iterator i = routes.begin();
        i != routes.end(); ++i) {
-    types_with_payloads[i->first] = payload;
+    type_state_map[i->first].payload = payload;
   }
-  return types_with_payloads;
+  return type_state_map;
 }
 
 ModelTypeSet GetRoutingInfoTypes(const ModelSafeRoutingInfo& routing_info) {
   ModelTypeSet types;
   for (ModelSafeRoutingInfo::const_iterator it = routing_info.begin();
        it != routing_info.end(); ++it) {
     types.Put(it->first);
   }
   return types;
 }
@@ skipping 25 matching lines @@
       return "GROUP_PASSWORD";
     default:
       NOTREACHED();
       return "INVALID";
   }
 }
 
 ModelSafeWorker::~ModelSafeWorker() {}
 
 }  // namespace syncer