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

chrome/browser/sync/glue/sync_backend_host.cc

Index: chrome/browser/sync/glue/sync_backend_host.cc
===================================================================
--- chrome/browser/sync/glue/sync_backend_host.cc	(revision 94934)
+++ chrome/browser/sync/glue/sync_backend_host.cc	(working copy)
@@ -388,7 +388,7 @@
   if (pending_config_mode_state_->deleted_type) {
     sync_thread_.message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(core_.get(),
-        &SyncBackendHost::Core::DeferNudgeForCleanup));
+        &SyncBackendHost::Core::DeferCleanup));
   }
 
   if (pending_config_mode_state_->added_types.none() &&
@@ -447,12 +447,6 @@
   return core_->sync_manager()->GetEncryptedDataTypes();
 }
 
-void SyncBackendHost::RequestNudge(const tracked_objects::Location& location) {
-  sync_thread_.message_loop()->PostTask(FROM_HERE,
-      NewRunnableMethod(core_.get(), &SyncBackendHost::Core::DoRequestNudge,
-                        location));
-}
-
 void SyncBackendHost::ActivateDataType(
     DataTypeController* data_type_controller,
     ChangeProcessor* change_processor) {
@@ -638,7 +632,7 @@
       sync_manager_observer_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       parent_router_(NULL),
       processing_passphrase_(false),
-      deferred_nudge_for_cleanup_requested_(false) {
+      deferred_cleanup_requested_(false) {
 }
 
 // Helper to construct a user agent string (ASCII) suitable for use by
@@ -718,9 +712,9 @@
 void SyncBackendHost::Core::DoStartSyncing() {
   DCHECK(MessageLoop::current() == host_->sync_thread_.message_loop());
   sync_manager_->StartSyncingNormally();
-  if (deferred_nudge_for_cleanup_requested_)
-    sync_manager_->RequestNudge(FROM_HERE);
-  deferred_nudge_for_cleanup_requested_ = false;
+  if (deferred_cleanup_requested_)
+    sync_manager_->RequestCleanupDisabledTypes();
+  deferred_cleanup_requested_ = false;
 }
 
 void SyncBackendHost::Core::DoSetPassphrase(const std::string& passphrase,
@@ -1080,11 +1074,6 @@
       this, &Core::SaveChanges);
 }
 
-void SyncBackendHost::Core::DoRequestNudge(
-    const tracked_objects::Location& nudge_location) {
-  sync_manager_->RequestNudge(nudge_location);
-}
-
 void SyncBackendHost::Core::DoRequestClearServerData() {
   sync_manager_->RequestClearServerData();
 }
@@ -1164,9 +1153,9 @@
   sync_manager_->GetJsBackend()->ProcessMessage(name, args, sender);
 }
 
-void SyncBackendHost::Core::DeferNudgeForCleanup() {
+void SyncBackendHost::Core::DeferCleanup() {
   DCHECK_EQ(MessageLoop::current(), host_->sync_thread_.message_loop());
-  deferred_nudge_for_cleanup_requested_ = true;
+  deferred_cleanup_requested_ = true;
 }
 
 }  // namespace browser_sync