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

sync/test/engine/syncer_command_test.h

Index: sync/test/engine/syncer_command_test.h
diff --git a/sync/test/engine/syncer_command_test.h b/sync/test/engine/syncer_command_test.h
index 3db8ae8d47a99a132ef0c3c14558e53ee77b28c6..58b034f191bc49cf0600a738b61435de14ec83a2 100644
--- a/sync/test/engine/syncer_command_test.h
+++ b/sync/test/engine/syncer_command_test.h
@@ -102,8 +102,7 @@ class SyncerCommandTestBase : public testing::Test,
   // Lazily create a session requesting all datatypes with no payload.
   sessions::SyncSession* session() {
     syncable::ModelTypePayloadMap types =
-        syncable::ModelTypePayloadMapFromRoutingInfo(routing_info_,
-                                                     std::string());
+        ModelSafeRoutingInfoToPayloadMap(routing_info_, std::string());
     return session(sessions::SyncSourceInfo(types));
   }