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

components/sync/driver/glue/sync_backend_host_core.h

Index: components/sync/driver/glue/sync_backend_host_core.h
diff --git a/components/sync/driver/glue/sync_backend_host_core.h b/components/sync/driver/glue/sync_backend_host_core.h
index de3a6f04fa0b7577398de1b2d74dc02a6613b555..714059f02a9ddbe9def879b6da023b6045ab7181 100644
--- a/components/sync/driver/glue/sync_backend_host_core.h
+++ b/components/sync/driver/glue/sync_backend_host_core.h
@@ -18,10 +18,10 @@
 #include "components/invalidation/public/invalidation.h"
 #include "components/sync/base/cancelation_signal.h"
 #include "components/sync/base/system_encryptor.h"
-#include "components/sync/core/shutdown_reason.h"
-#include "components/sync/core/sync_encryption_handler.h"
 #include "components/sync/driver/glue/sync_backend_host_impl.h"
 #include "components/sync/engine/cycle/type_debug_info_observer.h"
+#include "components/sync/engine/shutdown_reason.h"
+#include "components/sync/engine/sync_encryption_handler.h"
 #include "url/gurl.h"
 
 namespace syncer {
@@ -45,7 +45,7 @@ struct DoInitializeOptions {
       bool delete_sync_data_folder,
       const std::string& restored_key_for_bootstrapping,
       const std::string& restored_keystore_key_for_bootstrapping,
-      std::unique_ptr<InternalComponentsFactory> internal_components_factory,
+      std::unique_ptr<EngineComponentsFactory> engine_components_factory,
       const WeakHandle<UnrecoverableErrorHandler>& unrecoverable_error_handler,
       const base::Closure& report_unrecoverable_error_function,
       std::unique_ptr<SyncEncryptionHandler::NigoriState> saved_nigori_state,
@@ -68,7 +68,7 @@ struct DoInitializeOptions {
   bool delete_sync_data_folder;
   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;
   const WeakHandle<UnrecoverableErrorHandler> unrecoverable_error_handler;
   base::Closure report_unrecoverable_error_function;
   std::unique_ptr<SyncEncryptionHandler::NigoriState> saved_nigori_state;