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

sync/internal_api/public/engine/model_safe_worker.h

 // 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.
 
 #ifndef SYNC_INTERNAL_API_PUBLIC_ENGINE_MODEL_SAFE_WORKER_H_
 #define SYNC_INTERNAL_API_PUBLIC_ENGINE_MODEL_SAFE_WORKER_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
-#include "sync/internal_api/public/syncable/model_type.h"
+#include "sync/internal_api/public/base/model_type.h"
+#include "sync/internal_api/public/base/model_type_payload_map.h"
 #include "sync/internal_api/public/util/syncer_error.h"
 
 namespace base {
 class DictionaryValue;
 }  // namespace
 
 namespace syncer {
 
 typedef base::Callback<enum SyncerError(void)> WorkCallback;
 
@@ skipping 43 matching lines @@
 typedef std::map<syncable::ModelType, ModelSafeGroup>
     ModelSafeRoutingInfo;
 
 // Caller takes ownership of return value.
 base::DictionaryValue* ModelSafeRoutingInfoToValue(
     const ModelSafeRoutingInfo& routing_info);
 
 std::string ModelSafeRoutingInfoToString(
     const ModelSafeRoutingInfo& routing_info);
 
+// Make a ModelTypePayloadMap for all the enabled types in a
+// ModelSafeRoutingInfo using a default payload.
+syncable::ModelTypePayloadMap ModelSafeRoutingInfoToPayloadMap(
+    const ModelSafeRoutingInfo& routes,
+    const std::string& payload);
+
 syncable::ModelTypeSet GetRoutingInfoTypes(
     const ModelSafeRoutingInfo& routing_info);
 
 ModelSafeGroup GetGroupForModelType(const syncable::ModelType type,
                                     const ModelSafeRoutingInfo& routes);
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_PUBLIC_ENGINE_MODEL_SAFE_WORKER_H_