[Sync] Make BackendMigrator not wait for full sync cycles

chrome/browser/sync/internal_api/sync_manager.cc

Index: chrome/browser/sync/internal_api/sync_manager.cc
diff --git a/chrome/browser/sync/internal_api/sync_manager.cc b/chrome/browser/sync/internal_api/sync_manager.cc
index dea6522a7e7d335ae5fba1c6e900e794eb6764ef..f588b37ffcff38f7db96020da8824a033f9739a5 100644
--- a/chrome/browser/sync/internal_api/sync_manager.cc
+++ b/chrome/browser/sync/internal_api/sync_manager.cc
@@ -678,9 +678,9 @@ bool SyncManager::IsUsingExplicitPassphrase() {
   return data_ && data_->IsUsingExplicitPassphrase();
 }
 
-void SyncManager::RequestCleanupDisabledTypes() {
+void SyncManager::RequestCleanupDisabledTypes(const base::Closure& callback) {
   if (data_->scheduler())
-    data_->scheduler()->ScheduleCleanupDisabledTypes();
+    data_->scheduler()->ScheduleCleanupDisabledTypes(callback);
 }
 
 void SyncManager::RequestClearServerData() {
@@ -696,11 +696,11 @@ void SyncManager::RequestConfig(const syncable::ModelTypeBitSet& types,
         << "null";
     return;
   }
-  StartConfigurationMode(NULL);
+  StartConfigurationMode(base::Closure());
   data_->scheduler()->ScheduleConfig(types, reason);
 }
 
-void SyncManager::StartConfigurationMode(ModeChangeCallback* callback) {
+void SyncManager::StartConfigurationMode(const base::Closure& callback) {
   if (!data_->scheduler()) {
     LOG(INFO)
         << "SyncManager::StartConfigurationMode: could not start "
@@ -782,7 +782,7 @@ bool SyncManager::SyncInternal::Init(
 
   if (signed_in && scheduler()) {
     scheduler()->Start(
-        browser_sync::SyncScheduler::CONFIGURATION_MODE, NULL);
+        browser_sync::SyncScheduler::CONFIGURATION_MODE, base::Closure());
   }
 
   initialized_ = true;
@@ -852,7 +852,7 @@ void SyncManager::SyncInternal::StartSyncingNormally() {
   // syncing until at least the DirectoryManager broadcasts the OPENED
   // event, and a valid server connection is detected.
   if (scheduler())  // NULL during certain unittests.
-    scheduler()->Start(SyncScheduler::NORMAL_MODE, NULL);
+    scheduler()->Start(SyncScheduler::NORMAL_MODE, base::Closure());
 }
 
 bool SyncManager::SyncInternal::OpenDirectory() {