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

sync/internal_api/public/engine/model_safe_worker.h

Index: sync/internal_api/public/engine/model_safe_worker.h
diff --git a/sync/internal_api/public/engine/model_safe_worker.h b/sync/internal_api/public/engine/model_safe_worker.h
index a78a322e05a83a3df14c1f47ff277ecffc91f1d2..ce14c1db0c52259c0e2de01f72fbfded3adfb1e3 100644
--- a/sync/internal_api/public/engine/model_safe_worker.h
+++ b/sync/internal_api/public/engine/model_safe_worker.h
@@ -12,7 +12,8 @@
 
 #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 {
@@ -76,6 +77,12 @@ base::DictionaryValue* ModelSafeRoutingInfoToValue(
 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);