[Sync] Add RequestCleanupDisabledTypes() method to SyncManager

chrome/browser/sync/engine/sync_scheduler_unittest.cc

Index: chrome/browser/sync/engine/sync_scheduler_unittest.cc
diff --git a/chrome/browser/sync/engine/sync_scheduler_unittest.cc b/chrome/browser/sync/engine/sync_scheduler_unittest.cc
index d7310d555adb0989d3ab6d07242fea864537ed2e..d2e42c014b35cbae3945c951cdaa1791e4490b09 100644
--- a/chrome/browser/sync/engine/sync_scheduler_unittest.cc
+++ b/chrome/browser/sync/engine/sync_scheduler_unittest.cc
@@ -946,7 +946,7 @@ TEST_F(SyncSchedulerTest, SyncerSteps) {
   Mock::VerifyAndClearExpectations(syncer());
 
   // ClearUserData.
-  EXPECT_CALL(*syncer(), SyncShare(_, CLEAR_PRIVATE_DATA, SYNCER_END))
+  EXPECT_CALL(*syncer(), SyncShare(_, CLEAR_PRIVATE_DATA, CLEAR_PRIVATE_DATA))
       .Times(1);
   StartSyncScheduler(SyncScheduler::NORMAL_MODE);
   RunLoop();
@@ -956,8 +956,8 @@ TEST_F(SyncSchedulerTest, SyncerSteps) {
   PumpLoop();
 
   scheduler()->Stop();
-
   Mock::VerifyAndClearExpectations(syncer());
+
   // Configuration.
   EXPECT_CALL(*syncer(), SyncShare(_, DOWNLOAD_UPDATES, APPLY_UPDATES));
   StartSyncScheduler(SyncScheduler::CONFIGURATION_MODE);
@@ -971,6 +971,20 @@ TEST_F(SyncSchedulerTest, SyncerSteps) {
   scheduler()->Stop();
   Mock::VerifyAndClearExpectations(syncer());
 
+  // CleanupDisabledTypes.
+  EXPECT_CALL(*syncer(),
+              SyncShare(_, CLEANUP_DISABLED_TYPES, CLEANUP_DISABLED_TYPES))
+      .Times(1);
+  StartSyncScheduler(SyncScheduler::NORMAL_MODE);
+  RunLoop();
+
+  scheduler()->ScheduleDisabledTypesCleanup();
+  PumpLoop();

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

remind me again why we have to do this twice now?
shouldn't we roll these together, either into PumpLoop() or PumpOnce and
PumpForSpecialReason (twice)

+  PumpLoop();
+
+  scheduler()->Stop();
+  Mock::VerifyAndClearExpectations(syncer());
+
   // Poll.
   EXPECT_CALL(*syncer(), SyncShare(_, SYNCER_BEGIN, SYNCER_END))
       .Times(AtLeast(1))