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

components/sync/driver/glue/sync_backend_host_core.cc

Index: components/sync/driver/glue/sync_backend_host_core.cc
diff --git a/components/sync/driver/glue/sync_backend_host_core.cc b/components/sync/driver/glue/sync_backend_host_core.cc
index 1eb7f639f6618561cbab1fca5e4d0f4454c7179f..8c3e250ad7e4362dd6f01350c667394b536c8f29 100644
--- a/components/sync/driver/glue/sync_backend_host_core.cc
+++ b/components/sync/driver/glue/sync_backend_host_core.cc
@@ -15,17 +15,17 @@
 #include "components/invalidation/public/invalidation_util.h"
 #include "components/invalidation/public/object_id_invalidation_map.h"
 #include "components/sync/base/invalidation_adapter.h"
-#include "components/sync/core/internal_components_factory.h"
-#include "components/sync/core/sync_manager.h"
-#include "components/sync/core/sync_manager_factory.h"
 #include "components/sync/device_info/local_device_info_provider_impl.h"
 #include "components/sync/driver/glue/sync_backend_registrar.h"
 #include "components/sync/engine/cycle/commit_counters.h"
 #include "components/sync/engine/cycle/status_counters.h"
 #include "components/sync/engine/cycle/sync_cycle_snapshot.h"
 #include "components/sync/engine/cycle/update_counters.h"
+#include "components/sync/engine/engine_components_factory.h"
 #include "components/sync/engine/events/protocol_event.h"
 #include "components/sync/engine/net/http_post_provider_factory.h"
+#include "components/sync/engine/sync_manager.h"
+#include "components/sync/engine/sync_manager_factory.h"
 
 // Helper macros to log with the syncer thread name; useful when there
 // are multiple syncers involved.
@@ -36,10 +36,6 @@
 
 static const int kSaveChangesIntervalSeconds = 10;
 
-namespace syncer {
-class InternalComponentsFactory;
-}  // namespace syncer
-
 namespace net {
 class URLFetcher;
 }
@@ -55,6 +51,8 @@ void BindFetcherToDataTracker(net::URLFetcher* fetcher) {
 
 namespace syncer {
 
+class EngineComponentsFactory;
+
 DoInitializeOptions::DoInitializeOptions(
     base::MessageLoop* sync_loop,
     SyncBackendRegistrar* registrar,
@@ -70,7 +68,7 @@ DoInitializeOptions::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,
@@ -90,7 +88,7 @@ DoInitializeOptions::DoInitializeOptions(
       restored_key_for_bootstrapping(restored_key_for_bootstrapping),
       restored_keystore_key_for_bootstrapping(
           restored_keystore_key_for_bootstrapping),
-      internal_components_factory(std::move(internal_components_factory)),
+      engine_components_factory(std::move(engine_components_factory)),
       unrecoverable_error_handler(unrecoverable_error_handler),
       report_unrecoverable_error_function(report_unrecoverable_error_function),
       saved_nigori_state(std::move(saved_nigori_state)),
@@ -418,8 +416,8 @@ void SyncBackendHostCore::DoInitialize(
   args.restored_key_for_bootstrapping = options->restored_key_for_bootstrapping;
   args.restored_keystore_key_for_bootstrapping =
       options->restored_keystore_key_for_bootstrapping;
-  args.internal_components_factory =
-      std::move(options->internal_components_factory);
+  args.engine_components_factory =
+      std::move(options->engine_components_factory);
   args.encryptor = &encryptor_;
   args.unrecoverable_error_handler = options->unrecoverable_error_handler;
   args.report_unrecoverable_error_function =