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

sync/test/engine/syncer_command_test.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_TEST_ENGINE_SYNCER_COMMAND_TEST_H_
 #define SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_
 #pragma once
 
 #include <algorithm>
 #include <string>
@@ skipping 84 matching lines @@
   virtual ~SyncerCommandTestBase();
   virtual void SetUp();
   virtual void TearDown();
 
   sessions::SyncSessionContext* context() const { return context_.get(); }
   sessions::SyncSession::Delegate* delegate() { return this; }
 
   // 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));
   }
 
   // Create a session with the provided source.
   sessions::SyncSession* session(const sessions::SyncSourceInfo& source) {
     if (!session_.get()) {
       std::vector<ModelSafeWorker*> workers = GetWorkers();
       session_.reset(new sessions::SyncSession(context(), delegate(), source,
                      routing_info_, workers));
     }
@@ skipping 112 matching lines @@
 
   virtual void SetUp() OVERRIDE;
 
   TestUnrecoverableErrorHandler handler_;
   syncable::MockDirectory mock_directory_;
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_