[Sync] Move the last things out of core/.

components/sync/model/fake_model_type_service.h

 // Copyright 2015 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 COMPONENTS_SYNC_MODEL_FAKE_MODEL_TYPE_SERVICE_H_
 #define COMPONENTS_SYNC_MODEL_FAKE_MODEL_TYPE_SERVICE_H_
 
 #include <map>
 #include <memory>
 #include <string>
 
-#include "components/sync/core/non_blocking_sync_common.h"
+#include "components/sync/engine/non_blocking_sync_common.h"
 #include "components/sync/model/entity_data.h"
 #include "components/sync/model/metadata_batch.h"
 #include "components/sync/model/model_type_service.h"
 #include "components/sync/protocol/entity_metadata.pb.h"
 #include "components/sync/protocol/model_type_state.pb.h"
 
 namespace syncer {
 
 // A basic, functional implementation of ModelTypeService for testing purposes.
 // It uses the PREFERENCES type to provide a simple key/value interface, and
@@ skipping 116 matching lines @@
   // The conflict resolution to use for calls to ResolveConflict.
   std::unique_ptr<ConflictResolution> conflict_resolution_;
 
   // The error to produce on the next service call.
   SyncError service_error_;
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_MODEL_FAKE_MODEL_TYPE_SERVICE_H_