Revert 179987

chrome/browser/browsing_data/browsing_data_remover.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 
 #include <set>
 
 #include "base/gtest_prod_util.h"
@@ skipping 32 matching lines @@
 }
 
 namespace dom_storage {
 struct LocalStorageUsageInfo;
 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 {
     LAST_HOUR = 0,
     LAST_DAY,
     LAST_WEEK,
     FOUR_WEEKS,
     EVERYTHING
   };
 
@@ skipping 135 matching lines @@
   virtual ~BrowsingDataRemover();
 
   // content::NotificationObserver method. Callback when TemplateURLService has
   // finished loading. Deletes the entries from the model, and if we're not
   // waiting on anything else notifies observers and deletes this
   // BrowsingDataRemover.
   virtual void Observe(int type,
                        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.
   virtual void OnDeauthorizeContentLicensesCompleted(uint32 request_id,
                                                      bool success) OVERRIDE;
 #endif
 
   // Removes the specified items related to browsing for a specific host. If the
   // provided |origin| is empty, data is removed for all origins. The
   // |origin_set_mask| parameter defines the set of origins from which data
@@ skipping 188 matching lines @@
 
   ObserverList<Observer> observer_list_;
 
   // Used if we need to clear history.
   CancelableTaskTracker history_task_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_