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

chrome/browser/sync/glue/sync_backend_host.h

Index: chrome/browser/sync/glue/sync_backend_host.h
===================================================================
--- chrome/browser/sync/glue/sync_backend_host.h	(revision 94934)
+++ chrome/browser/sync/glue/sync_backend_host.h	(working copy)
@@ -344,13 +344,12 @@
     // syncing (generally after initialization and authentication).
     void DoStartSyncing();
 
-    // Called on the SyncBackendHost sync_thread_ to nudge/pause/resume the
-    // syncer.
-    void DoRequestNudge(const tracked_objects::Location& location);
+    // Called on the SyncBackendHost sync_thread_ to clear server
+    // data.
     void DoRequestClearServerData();
 
-    // Sets |deferred_nudge_for_cleanup_requested_| to true. See comment below.
-    void DeferNudgeForCleanup();
+    // Sets |deferred_cleanup_requested_| to true. See comment below.
+    void DeferCleanup();
 
     // Called on our SyncBackendHost's |sync_thread_| to set the passphrase
     // on behalf of SyncBackendHost::SupplyPassphrase.
@@ -519,7 +518,8 @@
 
     // True when a datatype has been disabled so that we nudge once sync is
     // resumed (after configuration is finished).
-    bool deferred_nudge_for_cleanup_requested_;
+    // TODO(akalin): Remove the need for this.
+    bool deferred_cleanup_requested_;
 
     DISALLOW_COPY_AND_ASSIGN(Core);
   };
@@ -529,9 +529,6 @@
   // set up initial conditions.
   virtual void HandleInitializationCompletedOnFrontendLoop(bool success);
 
-  // Posts a nudge request on the sync thread.
-  virtual void RequestNudge(const tracked_objects::Location& location);
-
   // Called to finish the job of ConfigureDataTypes once the syncer is in
   // configuration mode.
   void FinishConfigureDataTypes();