Merge 94530 - [Sync] Add RequestCleanupDisabledTypes() method to SyncManager

chrome/browser/sync/engine/sync_scheduler_unittest.cc

Index: chrome/browser/sync/engine/sync_scheduler_unittest.cc
===================================================================
--- chrome/browser/sync/engine/sync_scheduler_unittest.cc	(revision 94934)
+++ chrome/browser/sync/engine/sync_scheduler_unittest.cc	(working copy)
@@ -946,7 +946,7 @@
   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 @@
   PumpLoop();
 
   scheduler()->Stop();
+  Mock::VerifyAndClearExpectations(syncer());
 
-  Mock::VerifyAndClearExpectations(syncer());
   // Configuration.
   EXPECT_CALL(*syncer(), SyncShare(_, DOWNLOAD_UPDATES, APPLY_UPDATES));
   StartSyncScheduler(SyncScheduler::CONFIGURATION_MODE);
@@ -971,6 +971,19 @@
   scheduler()->Stop();
   Mock::VerifyAndClearExpectations(syncer());
 
+  // Cleanup disabled types.
+  EXPECT_CALL(*syncer(),
+              SyncShare(_, CLEANUP_DISABLED_TYPES, CLEANUP_DISABLED_TYPES));
+  StartSyncScheduler(SyncScheduler::NORMAL_MODE);
+  RunLoop();
+
+  scheduler()->ScheduleCleanupDisabledTypes();
+  PumpLoop();
+  PumpLoop();
+
+  scheduler()->Stop();
+  Mock::VerifyAndClearExpectations(syncer());
+
   // Poll.
   EXPECT_CALL(*syncer(), SyncShare(_, SYNCER_BEGIN, SYNCER_END))
       .Times(AtLeast(1))