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

chrome/browser/sync/test_profile_sync_service.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 "chrome/browser/sync/test_profile_sync_service.h"
 
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
@@ skipping 24 matching lines @@
     bool fail_initial_download,
     bool use_real_database)
     : browser_sync::SyncBackendHost(
         profile->GetDebugName(), profile, sync_prefs, invalidator_storage),
       synchronous_init_(synchronous_init),
       fail_initial_download_(fail_initial_download),
       use_real_database_(use_real_database) {}
 
 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() {
-  return new browser_sync::TestHttpBridgeFactory();
+scoped_ptr<syncer::HttpPostProviderFactory> MakeTestHttpBridgeFactory() {
+  return scoped_ptr<syncer::HttpPostProviderFactory>(
+      new browser_sync::TestHttpBridgeFactory());
 }
 
 }  // namespace
 
 void SyncBackendHostForProfileSyncTest::InitCore(
     const DoInitializeOptions& options) {
   DoInitializeOptions test_options = options;
   test_options.make_http_bridge_factory_fn =
       base::Bind(&MakeTestHttpBridgeFactory);
   test_options.credentials.email = "testuser@gmail.com";
   test_options.credentials.sync_token = "token";
   test_options.restored_key_for_bootstrapping = "";
   test_options.testing_mode =
       use_real_database_ ? syncer::SyncManager::TEST_ON_DISK
                          : syncer::SyncManager::TEST_IN_MEMORY;
   SyncBackendHost::InitCore(test_options);
   // TODO(akalin): Figure out a better way to do this.
   if (synchronous_init_) {
     // The SyncBackend posts a task to the current loop when
     // initialization completes.
     MessageLoop::current()->Run();
   }
 }
 
-void SyncBackendHostForProfileSyncTest::StartConfiguration(
-    const base::Closure& callback) {
-  SyncBackendHost::FinishConfigureDataTypesOnFrontendLoop();
-  if (IsDownloadingNigoriForTest()) {
-    syncer::ModelTypeSet sync_ended;
+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);
 
-    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));
-  }
+  FinishConfigureDataTypesOnFrontendLoop(types_to_config,
+                                         sync_ended,
+                                         ready_task);
 }
 
 void SyncBackendHostForProfileSyncTest::SetHistoryServiceExpectations(
     ProfileMock* profile) {
   EXPECT_CALL(*profile, GetHistoryService(testing::_)).
       WillOnce(testing::Return((HistoryService*)NULL));
 }
 
 }  // namespace browser_sync
 
@@ skipping 113 matching lines @@
 void TestProfileSyncService::CreateBackend() {
   backend_.reset(new browser_sync::SyncBackendHostForProfileSyncTest(
       profile(),
       sync_prefs_.AsWeakPtr(),
       invalidator_storage_.AsWeakPtr(),
       set_initial_sync_ended_on_init_,
       synchronous_backend_initialization_,
       fail_initial_download_,
       use_real_database_));
 }