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

components/sync/engine/sync_manager.h

Index: components/sync/engine/sync_manager.h
diff --git a/components/sync/core/sync_manager.h b/components/sync/engine/sync_manager.h
similarity index 96%
rename from components/sync/core/sync_manager.h
rename to components/sync/engine/sync_manager.h
index 9df691638439b9a09b7125791da46c6999f82384..71bfcdc845f54d1b2fd1b2929386300cd4b1755d 100644
--- a/components/sync/core/sync_manager.h
+++ b/components/sync/engine/sync_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_CORE_SYNC_MANAGER_H_
-#define COMPONENTS_SYNC_CORE_SYNC_MANAGER_H_
+#ifndef COMPONENTS_SYNC_ENGINE_SYNC_MANAGER_H_
+#define COMPONENTS_SYNC_ENGINE_SYNC_MANAGER_H_
 
 #include <stdint.h>
 
@@ -19,15 +19,15 @@
 #include "components/sync/base/invalidation_interface.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/weak_handle.h"
-#include "components/sync/core/configure_reason.h"
-#include "components/sync/core/connection_status.h"
-#include "components/sync/core/internal_components_factory.h"
-#include "components/sync/core/model_type_connector.h"
-#include "components/sync/core/shutdown_reason.h"
-#include "components/sync/core/sync_encryption_handler.h"
+#include "components/sync/engine/configure_reason.h"
+#include "components/sync/engine/connection_status.h"
+#include "components/sync/engine/engine_components_factory.h"
 #include "components/sync/engine/events/protocol_event.h"
 #include "components/sync/engine/model_safe_worker.h"
+#include "components/sync/engine/model_type_connector.h"
 #include "components/sync/engine/net/http_post_provider_factory.h"
+#include "components/sync/engine/shutdown_reason.h"
+#include "components/sync/engine/sync_encryption_handler.h"
 #include "components/sync/engine/sync_status.h"
 #include "components/sync/protocol/sync_protocol_error.h"
 #include "components/sync/syncable/change_record.h"
@@ -45,8 +45,8 @@ class BaseTransaction;
 class CancelationSignal;
 class DataTypeDebugInfoListener;
 class Encryptor;
+class EngineComponentsFactory;
 class ExtensionsActivity;
-class InternalComponentsFactory;
 class JsBackend;
 class JsEventHandler;
 class ProtocolEvent;
@@ -245,7 +245,7 @@ class SyncManager {
     std::string restored_key_for_bootstrapping;
     std::string restored_keystore_key_for_bootstrapping;
 
-    std::unique_ptr<InternalComponentsFactory> internal_components_factory;
+    std::unique_ptr<EngineComponentsFactory> engine_components_factory;
 
     // Must outlive SyncManager.
     Encryptor* encryptor;
@@ -399,4 +399,4 @@ class SyncManager {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_CORE_SYNC_MANAGER_H_
+#endif  // COMPONENTS_SYNC_ENGINE_SYNC_MANAGER_H_