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

sync/engine/sync_scheduler.cc

Index: sync/engine/sync_scheduler.cc
diff --git a/sync/engine/sync_scheduler.cc b/sync/engine/sync_scheduler.cc
index 23ad567ece3f14501936c19f7ae8a4fd40fb65ff..b41625a9d2b8665e17f9dc10930848e702eeb73f 100644
--- a/sync/engine/sync_scheduler.cc
+++ b/sync/engine/sync_scheduler.cc
@@ -603,8 +603,7 @@ void SyncScheduler::ScheduleConfiguration(
 
   SyncSession* session = new SyncSession(session_context_, this,
       SyncSourceInfo(source,
-                     syncable::ModelTypePayloadMapFromRoutingInfo(
-                         routes, std::string())),
+                     ModelSafeRoutingInfoToPayloadMap(routes, std::string())),
       routes, workers);
   SyncSessionJob job(SyncSessionJob::CONFIGURATION, TimeTicks::Now(),
                      make_linked_ptr(session),
@@ -1032,7 +1031,7 @@ void SyncScheduler::PollTimerCallback() {
   DCHECK_EQ(MessageLoop::current(), sync_loop_);
   ModelSafeRoutingInfo r;
   ModelTypePayloadMap types_with_payloads =
-      syncable::ModelTypePayloadMapFromRoutingInfo(r, std::string());
+      ModelSafeRoutingInfoToPayloadMap(r, std::string());
   SyncSourceInfo info(GetUpdatesCallerInfo::PERIODIC, types_with_payloads);
   SyncSession* s = CreateSyncSession(info);