[Sync] Add RequestCleanupDisabledTypes() method to SyncManager

chrome/browser/sync/engine/syncapi.cc

Index: chrome/browser/sync/engine/syncapi.cc
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc
index 51e603c890cc431c51ae848d74e091ede3d436e5..393b50c4f2bb9bba9340706f910b0aa62c551d99 100644
--- a/chrome/browser/sync/engine/syncapi.cc
+++ b/chrome/browser/sync/engine/syncapi.cc
@@ -1883,11 +1883,15 @@ bool SyncManager::SyncInternal::UpdateCryptographerFromNigori() {
 }
 
 void SyncManager::SyncInternal::StartSyncingNormally() {
-  // Start the sync scheduler. This won't actually result in any
-  // syncing until at least the DirectoryManager broadcasts the OPENED
-  // event, and a valid server connection is detected.
-  if (scheduler())  // NULL during certain unittests.
+  // NULL during certain unittests.
+  if (scheduler()) {
+    // Start the sync scheduler. This won't actually result in any
+    // syncing until at least the DirectoryManager broadcasts the
+    // OPENED event, and a valid server connection is detected.
     scheduler()->Start(SyncScheduler::NORMAL_MODE, NULL);
+    // Cleanup any types disabled since the last time we synced.
+    scheduler()->ScheduleDisabledTypesCleanup();

[tim (not reviewing), 2011/06/29 22:50:52]

It does seem weird to always do this at this layer, I assume it was easier than
scheduling from SBH?  On the flip side... would it'd be weirder to do it inside
the scheduler Start()?  and not bother exposing this method (I suggest it since
it looks like you're trying to bury the api)

Have you tried running the Migration* integration tests?
The migrator explicitly waits for cleanups to happen...

+  }
 }
 
 bool SyncManager::SyncInternal::OpenDirectory() {