[Sync] Add RequestCleanupDisabledTypes() method to SyncManager

chrome/browser/sync/engine/syncapi.cc

 // Copyright (c) 2011 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/engine/syncapi.h"
 
 #include <algorithm>
 #include <bitset>
 #include <iomanip>
 #include <list>
@@ skipping 1865 matching lines @@
     ObserverList<SyncManager::Observer> temp_obs_list;
     CopyObservers(&temp_obs_list);
     FOR_EACH_OBSERVER(SyncManager::Observer, temp_obs_list,
                       OnPassphraseRequired(sync_api::REASON_DECRYPTION));
   }
 
   return cryptographer->is_ready();
 }
 
 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() {
   DCHECK(!initialized_) << "Should only happen once";
 
   bool share_opened = dir_manager()->Open(username_for_share(), this);
   DCHECK(share_opened);
   if (!share_opened) {
     ObserverList<SyncManager::Observer> temp_obs_list;
     CopyObservers(&temp_obs_list);
@@ skipping 1153 matching lines @@
 void SyncManager::TriggerOnIncomingNotificationForTest(
     const syncable::ModelTypeBitSet& model_types) {
   syncable::ModelTypePayloadMap model_types_with_payloads =
       syncable::ModelTypePayloadMapFromBitSet(model_types,
           std::string());
 
   data_->OnIncomingNotification(model_types_with_payloads);
 }
 
 }  // namespace sync_api