Revert "Revert 142517 - [Sync] Refactor sync configuration logic."

chrome/browser/sync/test_profile_sync_service.cc

Index: chrome/browser/sync/test_profile_sync_service.cc
diff --git a/chrome/browser/sync/test_profile_sync_service.cc b/chrome/browser/sync/test_profile_sync_service.cc
index 26a0b1bcbe445247ceda1a2f5cd335a48fb1f2ee..22eaaa13fecf1b42f8c5aba0b0804cd81ecb4707 100644
--- a/chrome/browser/sync/test_profile_sync_service.cc
+++ b/chrome/browser/sync/test_profile_sync_service.cc
@@ -42,20 +42,6 @@ SyncBackendHostForProfileSyncTest::SyncBackendHostForProfileSyncTest(
 
 SyncBackendHostForProfileSyncTest::~SyncBackendHostForProfileSyncTest() {}
 
-void SyncBackendHostForProfileSyncTest::
-    SimulateSyncCycleCompletedInitialSyncEnded(
-    const tracked_objects::Location& location) {
-  syncer::ModelTypeSet sync_ended;
-  if (!fail_initial_download_)
-    sync_ended = syncer::ModelTypeSet::All();
-  syncer::ModelTypePayloadMap download_progress_markers;
-  HandleSyncCycleCompletedOnFrontendLoop(
-      SyncSessionSnapshot(
-          ModelNeutralState(), false, sync_ended, download_progress_markers,
-          false, false, 0, 0, 0, 0, SyncSourceInfo(), false, 0,
-          base::Time::Now(), false));
-}
-
 namespace {
 
 syncer::HttpPostProviderFactory* MakeTestHttpBridgeFactory() {
@@ -84,21 +70,19 @@ void SyncBackendHostForProfileSyncTest::InitCore(
   }
 }
 
-void SyncBackendHostForProfileSyncTest::StartConfiguration(
-    const base::Closure& callback) {
-  SyncBackendHost::FinishConfigureDataTypesOnFrontendLoop();
-  if (IsDownloadingNigoriForTest()) {
-    syncer::ModelTypeSet sync_ended;
-
-    if (!fail_initial_download_)
-      sync_ended.Put(syncer::NIGORI);
-    syncer::ModelTypePayloadMap download_progress_markers;
-    HandleSyncCycleCompletedOnFrontendLoop(
-        SyncSessionSnapshot(
-            ModelNeutralState(), false, sync_ended, download_progress_markers,
-            false, false, 0, 0, 0, 0, SyncSourceInfo(), false, 0,
-            base::Time::Now(), false));
-  }
+void SyncBackendHostForProfileSyncTest::RequestConfigureSyncer(
+    syncer::ConfigureReason reason,
+    syncer::ModelTypeSet types_to_config,
+    const syncer::ModelSafeRoutingInfo& routing_info,
+    const base::Callback<void(syncer::ModelTypeSet)>& ready_task,
+    const base::Closure& retry_callback) {
+  syncer::ModelTypeSet sync_ended;
+  if (!fail_initial_download_)
+    sync_ended.PutAll(types_to_config);
+
+  FinishConfigureDataTypesOnFrontendLoop(types_to_config,
+                                         sync_ended,
+                                         ready_task);
 }
 
 void SyncBackendHostForProfileSyncTest::SetHistoryServiceExpectations(