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

sync/syncable/nigori_util.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.
 
 // Various utility methods for nigori-based multi-type encryption.
 
 #ifndef SYNC_SYNCABLE_NIGORI_UTIL_H_
 #define SYNC_SYNCABLE_NIGORI_UTIL_H_
 #pragma once
 
 #include "base/compiler_specific.h"
-#include "sync/internal_api/public/syncable/model_type.h"
+#include "sync/internal_api/public/base/model_type.h"
 #include "sync/protocol/nigori_specifics.pb.h"
 
 namespace sync_pb {
 class EntitySpecifics;
 }
 
 namespace syncer {
 class Cryptographer;
 
 namespace syncable {
@@ skipping 43 matching lines @@
 // Note: gracefully handles new_specifics aliasing with entry->Get(SPECIFICS).
 bool UpdateEntryWithEncryption(
     syncer::Cryptographer* cryptographer,
     const sync_pb::EntitySpecifics& new_specifics,
     MutableEntry* entry);
 
 }  // namespace syncable
 }  // namespace syncer
 
 #endif  // SYNC_SYNCABLE_NIGORI_UTIL_H_