Refactor: Simplify WaitableEventWatcher.

chrome/browser/browsing_data/browsing_data_remover.h

Index: chrome/browser/browsing_data/browsing_data_remover.h
diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h
index 7222237bee2f931b97357304d24963f6b995611f..085e796e0ffb1af41261f5a54f1ceed463a2360e 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.h
+++ b/chrome/browser/browsing_data/browsing_data_remover.h
@@ -50,11 +50,11 @@ struct SessionStorageUsageInfo;
 // BrowsingDataRemover is responsible for removing data related to browsing:
 // visits in url database, downloads, cookies ...
 
-class BrowsingDataRemover : public content::NotificationObserver,
+class BrowsingDataRemover : public content::NotificationObserver
 #if defined(ENABLE_PLUGINS)
-                            public PepperFlashSettingsManager::Client,
+                            , public PepperFlashSettingsManager::Client
 #endif
-                            public base::WaitableEventWatcher::Delegate {
+                            {
  public:
   // Time period ranges available when doing browsing data removals.
   enum TimePeriod {
@@ -210,10 +210,8 @@ class BrowsingDataRemover : public content::NotificationObserver,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // WaitableEventWatcher implementation.
   // Called when plug-in data has been cleared. Invokes NotifyAndDeleteIfDone.
-  virtual void OnWaitableEventSignaled(
-      base::WaitableEvent* waitable_event) OVERRIDE;
+  void OnWaitableEventSignaled(base::WaitableEvent* waitable_event);
 
 #if defined(ENABLE_PLUGINS)
   // PepperFlashSettingsManager::Client implementation.
@@ -370,6 +368,7 @@ class BrowsingDataRemover : public content::NotificationObserver,
   // Used to delete plugin data.
   scoped_ptr<content::PluginDataRemover> plugin_data_remover_;
   base::WaitableEventWatcher watcher_;
+  base::Callback<void(base::WaitableEvent*)> watcher_callback_;

[dmichael (off chromium), 2013/01/25 21:28:11]

IMO, The class shouldn't need to remember its callback

[teravest, 2013/01/28 17:10:55]

Done.

 
   // Used to deauthorize content licenses for Pepper Flash.
   scoped_ptr<PepperFlashSettingsManager> pepper_flash_settings_manager_;