Make ClearBrowsingDataHandler only observe its own removal task

chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h

Index: chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h
diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h
index 02f0202afc9eb7be30d54fe20c28865b00bdc6bd..06a19c56ef74ecdc9bdc099ee85ab930bede64fc 100644
--- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h
+++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h
@@ -30,7 +30,6 @@ namespace settings {
 
 // Chrome browser startup settings handler.
 class ClearBrowsingDataHandler : public SettingsPageUIHandler,
-                                 public BrowsingDataRemover::Observer,
                                  public sync_driver::SyncServiceObserver {
  public:
   explicit ClearBrowsingDataHandler(content::WebUI* webui);
@@ -42,11 +41,29 @@ class ClearBrowsingDataHandler : public SettingsPageUIHandler,
   void OnJavascriptDisallowed() override;
 
  private:
+  // Observes one |remover| task initiated from ClearBrowsingDataHandler.
+  // Calls |callback| when the task is finished.
+  class TaskObserver : public BrowsingDataRemover::Observer {

[Dan Beam, 2016/09/01 02:49:28]

can we just forward-declare this and implement solely in the .cc file?

[msramek, 2016/09/01 10:34:36]

Yep! Done.

+   public:
+    TaskObserver(BrowsingDataRemover* remover, const base::Closure& callback);
+    ~TaskObserver() override;
+
+    void OnBrowsingDataRemoverDone() override;
+
+   private:
+    base::Closure callback_;
+    ScopedObserver<BrowsingDataRemover, BrowsingDataRemover::Observer>
+        remover_observer_;
+
+    DISALLOW_COPY_AND_ASSIGN(TaskObserver);
+  };
+
   // Clears browsing data, called by Javascript.
   void HandleClearBrowsingData(const base::ListValue* value);
 
-  // BrowsingDataRemover::Observer implementation.
-  void OnBrowsingDataRemoving(bool is_removing) override;
+  // Called when a clearing task finished. |webui_callback_id| is provided
+  // by the WebUI action that initiated it.
+  void OnClearingTaskFinished(const std::string& webui_callback_id);
 
   // Updates UI when the pref to allow clearing history changes.
   virtual void OnBrowsingHistoryPrefChanged();
@@ -84,20 +101,14 @@ class ClearBrowsingDataHandler : public SettingsPageUIHandler,
   // Counters that calculate the data volume for individual data types.
   std::vector<std::unique_ptr<browsing_data::BrowsingDataCounter>> counters_;
 
+  // Observes the currently active data clearing task.
+  std::unique_ptr<TaskObserver> task_observer_;
+
   // ProfileSyncService to observe sync state changes.
   ProfileSyncService* sync_service_;
   ScopedObserver<ProfileSyncService, sync_driver::SyncServiceObserver>
       sync_service_observer_;
 
-  // Observe the remover progress.
-  BrowsingDataRemover* remover_;
-  ScopedObserver<BrowsingDataRemover, BrowsingDataRemover::Observer>
-      remover_observer_;
-
-  // The WebUI callback ID of the last performClearBrowserData request. There
-  // can only be one such request in-flight.
-  std::string webui_callback_id_;
-
   // Used to listen for pref changes to allow / disallow deleting browsing data.
   PrefChangeRegistrar profile_pref_registrar_;