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

components/sync/test/engine/mock_model_type_worker.h

 // Copyright 2014 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_TEST_ENGINE_MOCK_MODEL_TYPE_WORKER_H_
 #define COMPONENTS_SYNC_TEST_ENGINE_MOCK_MODEL_TYPE_WORKER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <deque>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
-#include "components/sync/core/model_type_processor.h"
-#include "components/sync/core/non_blocking_sync_common.h"
 #include "components/sync/engine/commit_queue.h"
+#include "components/sync/engine/model_type_processor.h"
+#include "components/sync/engine/non_blocking_sync_common.h"
 #include "components/sync/protocol/model_type_state.pb.h"
 #include "components/sync/protocol/sync.pb.h"
 
 namespace syncer {
 
 // Receives and records commit requests sent through the ModelTypeWorker.
 //
 // This class also includes features intended to help mock out server behavior.
 // It has some basic functionality to keep track of server state and generate
 // plausible UpdateResponseData and CommitResponseData messages.
@@ skipping 89 matching lines @@
   // Map of versions by client tag hash.
   // This is an essential part of the mocked server state.
   std::map<const std::string, int64_t> server_versions_;
 
   DISALLOW_COPY_AND_ASSIGN(MockModelTypeWorker);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_TEST_ENGINE_MOCK_MODEL_TYPE_WORKER_H_