[Sync] Move model_type* from syncable/ to base/

sync/internal_api/public/syncable/model_type_payload_map.h

Index: sync/internal_api/public/syncable/model_type_payload_map.h
diff --git a/sync/internal_api/public/syncable/model_type_payload_map.h b/sync/internal_api/public/syncable/model_type_payload_map.h
deleted file mode 100644
index 077206bf62f9eba1003d9975bafdbd0c86057c23..0000000000000000000000000000000000000000
--- a/sync/internal_api/public/syncable/model_type_payload_map.h
+++ /dev/null
@@ -1,77 +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.
-//
-// Definition of ModelTypePayloadMap and various utility functions.
-
-#ifndef SYNC_INTERNAL_PUBLIC_API_SYNCABLE_MODEL_TYPE_PAYLOAD_MAP_H_
-#define SYNC_INTERNAL_PUBLIC_API_SYNCABLE_MODEL_TYPE_PAYLOAD_MAP_H_
-#pragma once
-
-#include <map>
-#include <string>
-
-#include "sync/internal_api/public/engine/model_safe_worker.h"
-#include "sync/internal_api/public/syncable/model_type.h"
-
-namespace base {
-class DictionaryValue;
-}
-
-namespace syncer {
-namespace syncable {
-
-// A container that contains a set of datatypes with possible string
-// payloads.
-typedef std::map<ModelType, std::string> ModelTypePayloadMap;
-
-// Helper functions for building ModelTypePayloadMaps.
-
-// Make a TypePayloadMap from all the types in a ModelTypeSet using a
-// default payload.
-ModelTypePayloadMap ModelTypePayloadMapFromEnumSet(
-    ModelTypeSet model_types, const std::string& payload);
-
-ModelTypeSet ModelTypePayloadMapToEnumSet(
-    const ModelTypePayloadMap& payload_map);
-
-// Make a TypePayloadMap for all the enabled types in a
-// ModelSafeRoutingInfo using a default payload.
-ModelTypePayloadMap ModelTypePayloadMapFromRoutingInfo(
-    const syncer::ModelSafeRoutingInfo& routes,
-    const std::string& payload);
-
-std::string ModelTypePayloadMapToString(
-    const ModelTypePayloadMap& model_type_payloads);
-
-// Caller takes ownership of the returned dictionary.
-base::DictionaryValue* ModelTypePayloadMapToValue(
-    const ModelTypePayloadMap& model_type_payloads);
-
-// Coalesce |update| into |original|, overwriting only when |update| has
-// a non-empty payload.
-void CoalescePayloads(ModelTypePayloadMap* original,
-                      const ModelTypePayloadMap& update);
-
-void PurgeStalePayload(ModelTypePayloadMap* original,
-                       const syncer::ModelSafeRoutingInfo& routing_info);
-
-}  // namespace syncable
-}  // namespace syncer
-
-// TODO(akalin): Move the names below to the 'syncer' namespace once
-// we move this file to public/base.
-namespace syncable {
-
-using ::syncer::syncable::ModelTypePayloadMap;
-using ::syncer::syncable::ModelTypePayloadMapFromEnumSet;
-using ::syncer::syncable::ModelTypePayloadMapToEnumSet;
-using ::syncer::syncable::ModelTypePayloadMapFromRoutingInfo;
-using ::syncer::syncable::ModelTypePayloadMapToString;
-using ::syncer::syncable::ModelTypePayloadMapToValue;
-using ::syncer::syncable::CoalescePayloads;
-using ::syncer::syncable::PurgeStalePayload;
-
-}  // namespace syncable
-
-#endif  // SYNC_INTERNAL_PUBLIC_API_SYNCABLE_MODEL_TYPE_PAYLOAD_MAP_H_