[Sync] Move ConfigureDataTypes logic into DataTypeManagerImpl.

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"
@@ skipping 31 matching lines @@
   SyncEngineForProfileSyncTest(
       const base::FilePath& temp_dir,
       syncer::SyncClient* sync_client,
       invalidation::InvalidationService* invalidator,
       const base::WeakPtr<syncer::SyncPrefs>& sync_prefs,
       const base::Closure& callback);
   ~SyncEngineForProfileSyncTest() override;
 
   void Initialize(InitParams params) override;
 
-  void RequestConfigureSyncer(
-      syncer::ConfigureReason reason,
-      syncer::ModelTypeSet to_download,
-      const syncer::ModelSafeRoutingInfo& routing_info,
-      const base::Callback<void(syncer::ModelTypeSet, syncer::ModelTypeSet)>&
-          ready_task,
-      const base::Closure& retry_callback) override;
+  void ConfigureDataTypes(ConfigureParams params) override;
 
  private:
   // Invoked at the start of HandleSyncManagerInitializationOnFrontendLoop.
   // Allows extra initialization work to be performed before the engine comes
   // up.
   base::Closure callback_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncEngineForProfileSyncTest);
 };
 
@@ skipping 28 matching lines @@
   syncer::EngineComponentsFactory::Switches factory_switches =
       params.engine_components_factory->GetSwitches();
   params.engine_components_factory =
       base::MakeUnique<syncer::TestEngineComponentsFactory>(
           factory_switches, syncer::EngineComponentsFactory::STORAGE_IN_MEMORY,
           nullptr);
 
   SyncBackendHostImpl::Initialize(std::move(params));
 }
 
-void SyncEngineForProfileSyncTest::RequestConfigureSyncer(
-    syncer::ConfigureReason reason,
-    syncer::ModelTypeSet to_download,
-    const syncer::ModelSafeRoutingInfo& routing_info,
-    const base::Callback<void(syncer::ModelTypeSet, syncer::ModelTypeSet)>&
-        ready_task,
-    const base::Closure& retry_callback) {
-  syncer::ModelTypeSet failed_configuration_types;
-
+void SyncEngineForProfileSyncTest::ConfigureDataTypes(ConfigureParams params) {
   // The first parameter there should be the set of enabled types.  That's not
   // something we have access to from this strange test harness.  We'll just
   // send back the list of newly configured types instead and hope it doesn't
   // break anything.
   // Posted to avoid re-entrancy issues.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(
           &SyncEngineForProfileSyncTest::FinishConfigureDataTypesOnFrontendLoop,
-          base::Unretained(this),
-          syncer::Difference(to_download, failed_configuration_types),
-          syncer::Difference(to_download, failed_configuration_types),
-          failed_configuration_types, ready_task));
+          base::Unretained(this), params.to_download, params.to_download,
+          syncer::ModelTypeSet(), params.ready_task));
 }
 
 // Helper function for return-type-upcasting of the callback.
 syncer::SyncService* GetSyncService(
     base::Callback<TestProfileSyncService*(void)> get_sync_service_callback) {
   return get_sync_service_callback.Run();
 }
 
 }  // namespace
 
@@ skipping 81 matching lines @@
 
 bool CreateRootHelper::success() {
   return success_;
 }
 
 void CreateRootHelper::CreateRootCallback() {
   success_ = test_->CreateRoot(model_type_);
 }
 
 }  // namespace browser_sync