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

components/browser_sync/abstract_profile_sync_service_test.cc

 // Copyright (c) 2012 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.
 
 #include "components/browser_sync/abstract_profile_sync_service_test.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "components/browser_sync/test_http_bridge_factory.h"
 #include "components/browser_sync/test_profile_sync_service.h"
-#include "components/sync/core/test/sync_manager_factory_for_profile_sync_test.h"
-#include "components/sync/core/test/test_internal_components_factory.h"
 #include "components/sync/driver/glue/sync_backend_host_core.h"
 #include "components/sync/driver/sync_api_component_factory_mock.h"
+#include "components/sync/engine/sync_manager_factory_for_profile_sync_test.h"
+#include "components/sync/engine/test_engine_components_factory.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "components/sync/syncable/test_user_share.h"
 #include "google_apis/gaia/gaia_constants.h"
 
 using syncer::SyncBackendHostImpl;
 using syncer::ModelType;
 using testing::_;
 using testing::Return;
 
 namespace browser_sync {
@@ skipping 58 matching lines @@
   options->http_bridge_factory =
       std::unique_ptr<syncer::HttpPostProviderFactory>(
           new TestHttpBridgeFactory());
   options->sync_manager_factory.reset(
       new syncer::SyncManagerFactoryForProfileSyncTest(callback_));
   options->credentials.email = "testuser@gmail.com";
   options->credentials.sync_token = "token";
   options->credentials.scope_set.insert(GaiaConstants::kChromeSyncOAuth2Scope);
   options->restored_key_for_bootstrapping.clear();
 
-  // It'd be nice if we avoided creating the InternalComponentsFactory in the
+  // It'd be nice if we avoided creating the EngineComponentsFactory in the
   // first place, but SyncBackendHost will have created one by now so we must
   // free it. Grab the switches to pass on first.
-  syncer::InternalComponentsFactory::Switches factory_switches =
-      options->internal_components_factory->GetSwitches();
-  options->internal_components_factory.reset(
-      new syncer::TestInternalComponentsFactory(
-          factory_switches,
-          syncer::InternalComponentsFactory::STORAGE_IN_MEMORY, nullptr));
+  syncer::EngineComponentsFactory::Switches factory_switches =
+      options->engine_components_factory->GetSwitches();
+  options->engine_components_factory.reset(
+      new syncer::TestEngineComponentsFactory(
+          factory_switches, syncer::EngineComponentsFactory::STORAGE_IN_MEMORY,
+          nullptr));
 
   SyncBackendHostImpl::InitCore(std::move(options));
 }
 
 void SyncBackendHostForProfileSyncTest::RequestConfigureSyncer(
     syncer::ConfigureReason reason,
     syncer::ModelTypeSet to_download,
     syncer::ModelTypeSet to_purge,
     syncer::ModelTypeSet to_journal,
     syncer::ModelTypeSet to_unapply,
@@ skipping 112 matching lines @@
 
 bool CreateRootHelper::success() {
   return success_;
 }
 
 void CreateRootHelper::CreateRootCallback() {
   success_ = test_->CreateRoot(model_type_);
 }
 
 }  // namespace browser_sync