Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/internal_api/public/base/model_type_payload_map.cc

Index: sync/internal_api/public/base/model_type_payload_map.cc
diff --git a/sync/internal_api/public/base/model_type_payload_map.cc b/sync/internal_api/public/base/model_type_payload_map.cc
deleted file mode 100644
index 1728130be466f97e6a1c7a226fa50a3e997ff44f..0000000000000000000000000000000000000000
--- a/sync/internal_api/public/base/model_type_payload_map.cc
+++ /dev/null
@@ -1,75 +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/internal_api/public/base/model_type_payload_map.h"
-
-#include <vector>
-
-#include "base/base64.h"
-#include "base/json/json_writer.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/values.h"
-
-namespace syncer {
-
-ModelTypePayloadMap ModelTypePayloadMapFromEnumSet(
-    ModelTypeSet types,
-    const std::string& payload) {
-  ModelTypePayloadMap types_with_payloads;
-  for (ModelTypeSet::Iterator it = types.First(); it.Good(); it.Inc()) {
-    types_with_payloads[it.Get()] = payload;
-  }
-  return types_with_payloads;
-}
-
-ModelTypeSet ModelTypePayloadMapToEnumSet(
-    const ModelTypePayloadMap& payload_map) {
-  ModelTypeSet types;
-  for (ModelTypePayloadMap::const_iterator it = payload_map.begin();
-       it != payload_map.end(); ++it) {
-    types.Put(it->first);
-  }
-  return types;
-}
-
-std::string ModelTypePayloadMapToString(
-    const ModelTypePayloadMap& type_payloads) {
-  scoped_ptr<DictionaryValue> value(
-      ModelTypePayloadMapToValue(type_payloads));
-  std::string json;
-  base::JSONWriter::Write(value.get(), &json);
-  return json;
-}
-
-DictionaryValue* ModelTypePayloadMapToValue(
-    const ModelTypePayloadMap& type_payloads) {
-  DictionaryValue* value = new DictionaryValue();
-  for (ModelTypePayloadMap::const_iterator it = type_payloads.begin();
-       it != type_payloads.end(); ++it) {
-    // TODO(akalin): Unpack the value into a protobuf.
-    std::string base64_marker;
-    bool encoded = base::Base64Encode(it->second, &base64_marker);
-    DCHECK(encoded);
-    value->SetString(ModelTypeToString(it->first), base64_marker);
-  }
-  return value;
-}
-
-void CoalescePayloads(ModelTypePayloadMap* original,
-                      const ModelTypePayloadMap& update) {
-  for (ModelTypePayloadMap::const_iterator i = update.begin();
-       i != update.end(); ++i) {
-    if (original->count(i->first) == 0) {
-      // If this datatype isn't already in our map, add it with
-      // whatever payload it has.
-      (*original)[i->first] = i->second;
-    } else if (i->second.length() > 0) {
-      // If this datatype is already in our map, we only overwrite the
-      // payload if the new one is non-empty.
-      (*original)[i->first] = i->second;
-    }
-  }
-}
-
-}  // namespace syncer