Revert 179987

chrome/browser/browsing_data/browsing_data_remover.h

Index: chrome/browser/browsing_data/browsing_data_remover.h
===================================================================
--- chrome/browser/browsing_data/browsing_data_remover.h	(revision 179992)
+++ chrome/browser/browsing_data/browsing_data_remover.h	(working copy)
@@ -50,11 +50,11 @@
 // 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,8 +210,10 @@
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // WaitableEventWatcher implementation.
   // Called when plug-in data has been cleared. Invokes NotifyAndDeleteIfDone.
-  void OnWaitableEventSignaled(base::WaitableEvent* waitable_event);
+  virtual void OnWaitableEventSignaled(
+      base::WaitableEvent* waitable_event) OVERRIDE;
 
 #if defined(ENABLE_PLUGINS)
   // PepperFlashSettingsManager::Client implementation.