[Sync] Add RequestCleanupDisabledTypes() method to SyncManager

chrome/browser/sync/engine/sync_scheduler_unittest.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 "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/message_loop.h"
 #include "base/task.h"
@@ skipping 928 matching lines @@
   scheduler()->ScheduleNudge(
       zero(), NUDGE_SOURCE_LOCAL, ModelTypeBitSet(), FROM_HERE);
   PumpLoop();
   // Pump again to run job.
   PumpLoop();
 
   scheduler()->Stop();
   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();
 
   scheduler()->ScheduleClearUserData();
   PumpLoop();
   PumpLoop();
 
   scheduler()->Stop();
+  Mock::VerifyAndClearExpectations(syncer());
 
-  Mock::VerifyAndClearExpectations(syncer());
   // Configuration.
   EXPECT_CALL(*syncer(), SyncShare(_, DOWNLOAD_UPDATES, APPLY_UPDATES));
   StartSyncScheduler(SyncScheduler::CONFIGURATION_MODE);
   RunLoop();
 
   scheduler()->ScheduleConfig(
       ModelTypeBitSet(), sync_api::CONFIGURE_REASON_RECONFIGURATION);
   PumpLoop();
   PumpLoop();
 
   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))
       .WillRepeatedly(QuitLoopNowAction());
   const TimeDelta poll(TimeDelta::FromMilliseconds(10));
   scheduler()->OnReceivedLongPollIntervalUpdate(poll);
 
   StartSyncScheduler(SyncScheduler::NORMAL_MODE);
   RunLoop();
 
@@ skipping 42 matching lines @@
   PumpLoop();
   // Pump again to run job.
   PumpLoop();
 
   scheduler()->Stop();
 
   EXPECT_TRUE(expected == context()->previous_session_routing_info());
 }
 
 }  // namespace browser_sync