Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/notifier/object_id_payload_map.cc

Index: sync/notifier/object_id_payload_map.cc
diff --git a/sync/notifier/object_id_payload_map.cc b/sync/notifier/object_id_payload_map.cc
deleted file mode 100644
index 7fa1f7cac35860b216912ffb6bb48a9a7593f13d..0000000000000000000000000000000000000000
--- a/sync/notifier/object_id_payload_map.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-// 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/notifier/object_id_payload_map.h"
-
-namespace syncer {
-
-ObjectIdSet ObjectIdPayloadMapToSet(
-    const ObjectIdPayloadMap& id_payloads) {
-  ObjectIdSet ids;
-  for (ObjectIdPayloadMap::const_iterator it = id_payloads.begin();
-       it != id_payloads.end(); ++it) {
-    ids.insert(it->first);
-  }
-  return ids;
-}
-
-ObjectIdPayloadMap ObjectIdSetToPayloadMap(ObjectIdSet ids,
-                                           const std::string& payload) {
-  ObjectIdPayloadMap id_payloads;
-  for (ObjectIdSet::const_iterator it = ids.begin(); it != ids.end(); ++it) {
-    id_payloads[*it] = payload;
-  }
-  return id_payloads;
-}
-
-ModelTypePayloadMap ObjectIdPayloadMapToModelTypePayloadMap(
-    const ObjectIdPayloadMap& id_payloads) {
-  ModelTypePayloadMap types_with_payloads;
-  for (ObjectIdPayloadMap::const_iterator it = id_payloads.begin();
-       it != id_payloads.end(); ++it) {
-    ModelType model_type;
-    if (!ObjectIdToRealModelType(it->first, &model_type)) {
-      DLOG(WARNING) << "Invalid object ID: "
-                    << ObjectIdToString(it->first);
-      continue;
-    }
-    types_with_payloads[model_type] = it->second;
-  }
-  return types_with_payloads;
-}
-
-ObjectIdPayloadMap ModelTypePayloadMapToObjectIdPayloadMap(
-    const ModelTypePayloadMap& type_payloads) {
-  ObjectIdPayloadMap id_payloads;
-  for (ModelTypePayloadMap::const_iterator it = type_payloads.begin();
-       it != type_payloads.end(); ++it) {
-    invalidation::ObjectId id;
-    if (!RealModelTypeToObjectId(it->first, &id)) {
-      DLOG(WARNING) << "Invalid model type " << it->first;
-      continue;
-    }
-    id_payloads[id] = it->second;
-  }
-  return id_payloads;
-}
-
-}  // namespace syncer