[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..bf43a414102b596e25cca4163ea10f0f5139114a 100644
--- a/chrome/browser/sync/engine/sync_scheduler_unittest.cc
+++ b/chrome/browser/sync/engine/sync_scheduler_unittest.cc
@@ -41,6 +41,7 @@ class MockSyncer : public Syncer {
  public:
   MOCK_METHOD3(SyncShare, void(sessions::SyncSession*, SyncerStep,
                                SyncerStep));
+  MOCK_METHOD1(CleanupDisabledTypes, void(sessions::SyncSession*));
 };
 
 // Used when tests want to record syncing activity to examine later.
@@ -946,7 +947,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 +957,8 @@ TEST_F(SyncSchedulerTest, SyncerSteps) {
   PumpLoop();
 
   scheduler()->Stop();
-
   Mock::VerifyAndClearExpectations(syncer());
+
   // Configuration.
   EXPECT_CALL(*syncer(), SyncShare(_, DOWNLOAD_UPDATES, APPLY_UPDATES));
   StartSyncScheduler(SyncScheduler::CONFIGURATION_MODE);
@@ -988,6 +989,19 @@ TEST_F(SyncSchedulerTest, SyncerSteps) {
   Mock::VerifyAndClearExpectations(syncer());
 }
 
+TEST_F(SyncSchedulerTest, CleanupDisabledTypes) {
+  EXPECT_CALL(*syncer(), CleanupDisabledTypes(_));
+  StartSyncScheduler(SyncScheduler::NORMAL_MODE);
+  RunLoop();
+
+  scheduler()->ScheduleCleanupDisabledTypes();
+  PumpLoop();
+  PumpLoop();
+
+  scheduler()->Stop();
+  Mock::VerifyAndClearExpectations(syncer());
+}
+
 // Test config tasks don't run during normal mode.
 // TODO(tim): Implement this test and then the functionality!
 TEST_F(SyncSchedulerTest, DISABLED_NoConfigDuringNormal) {