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

chrome/browser/sync/test/integration/sync_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 CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
 #pragma once
 
 #include "chrome/test/base/in_process_browser_test.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/process_util.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/test/local_sync_test_server.h"
-#include "sync/internal_api/public/syncable/model_type.h"
+#include "sync/internal_api/public/base/model_type.h"
 #include "sync/protocol/sync_protocol_error.h"
 
 class CommandLine;
 class Profile;
 class ProfileSyncServiceHarness;
 
 namespace net {
 class FakeURLFetcherFactory;
 class ProxyConfig;
 class ScopedDefaultHostResolverProc;
@@ skipping 321 matching lines @@
   scoped_ptr<net::URLFetcherImplFactory> factory_;
 
   // Number of default entries (as determined by the existing entries at setup
   // time on client 0).
   size_t number_of_default_sync_items_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncTest);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_