Revert 179987

content/browser/plugin_data_remover_impl_browsertest.cc

Index: content/browser/plugin_data_remover_impl_browsertest.cc
===================================================================
--- content/browser/plugin_data_remover_impl_browsertest.cc	(revision 179992)
+++ content/browser/plugin_data_remover_impl_browsertest.cc	(working copy)
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/base_paths.h"
-#include "base/callback.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/synchronization/waitable_event_watcher.h"
@@ -20,11 +19,12 @@
 const char* kNPAPITestPluginMimeType = "application/vnd.npapi-test";
 }
 
-class PluginDataRemoverTest : public ContentBrowserTest {
+class PluginDataRemoverTest : public ContentBrowserTest,
+                              public base::WaitableEventWatcher::Delegate {
  public:
   PluginDataRemoverTest() {}
 
-  void OnWaitableEventSignaled(base::WaitableEvent* waitable_event) {
+  virtual void OnWaitableEventSignaled(base::WaitableEvent* waitable_event) {
     MessageLoop::current()->Quit();
   }
 
@@ -51,9 +51,7 @@
   base::WaitableEventWatcher watcher;
   base::WaitableEvent* event =
       plugin_data_remover.StartRemoving(base::Time());
-  watcher.StartWatching(
-      event,
-      base::Bind(&PluginDataRemoverTest::OnWaitableEventSignaled, this));
+  watcher.StartWatching(event, this);
   RunMessageLoop();
 }