Remove custom Task implementation from process_util_win.cc.

base/process_util_win.cc

Index: base/process_util_win.cc
diff --git a/base/process_util_win.cc b/base/process_util_win.cc
index ff9d3fd2533c229a9b4186ca698a52523ad6b391..2af4079f101170e82db3cae89699a3dc66f8f274 100644
--- a/base/process_util_win.cc
+++ b/base/process_util_win.cc
@@ -12,6 +12,8 @@
 
 #include <ios>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"
@@ -108,49 +110,18 @@ void OnNoMemory() {
   _exit(1);
 }
 
-class TimerExpiredTask : public Task,
-                         public win::ObjectWatcher::Delegate {
+class TimerExpiredTask : public win::ObjectWatcher::Delegate {
  public:
-  explicit TimerExpiredTask(ProcessHandle process) : process_(process) {
-    watcher_.StartWatching(process_, this);
-  }
-
-  virtual ~TimerExpiredTask() {
-    if (process_) {
-      KillProcess();
-      DCHECK(!process_) << "Make sure to close the handle.";
-    }
-  }
-
-  // Task ---------------------------------------------------------------------
+  explicit TimerExpiredTask(ProcessHandle process);
+  ~TimerExpiredTask();
 
-  virtual void Run() {
-    if (process_)
-      KillProcess();
-  }
+  void TimedOut();
 
   // MessageLoop::Watcher -----------------------------------------------------
-
-  virtual void OnObjectSignaled(HANDLE object) {
-    // When we're called from KillProcess, the ObjectWatcher may still be
-    // watching.  the process handle, so make sure it has stopped.
-    watcher_.StopWatching();
-
-    CloseHandle(process_);
-    process_ = NULL;
-  }
+  virtual void OnObjectSignaled(HANDLE object);
 
  private:
-  void KillProcess() {
-    // OK, time to get frisky.  We don't actually care when the process
-    // terminates.  We just care that it eventually terminates, and that's what
-    // TerminateProcess should do for us. Don't check for the result code since
-    // it fails quite often. This should be investigated eventually.
-    base::KillProcess(process_, kProcessKilledExitCode, false);
-
-    // Now, just cleanup as if the process exited normally.
-    OnObjectSignaled(process_);
-  }
+  void KillProcess();
 
   // The process that we are watching.
   ProcessHandle process_;
@@ -160,6 +131,41 @@ class TimerExpiredTask : public Task,
   DISALLOW_COPY_AND_ASSIGN(TimerExpiredTask);
 };
 
+TimerExpiredTask::TimerExpiredTask(ProcessHandle process) : process_(process) {
+  watcher_.StartWatching(process_, this);
+}
+
+TimerExpiredTask::~TimerExpiredTask() {

[willchan no longer on Chromium, 2011/12/13 00:41:14]

Should this just call TimedOut() and then DCHECK afterward?

+  if (process_) {
+    KillProcess();
+    DCHECK(!process_) << "Make sure to close the handle.";
+  }
+}
+
+void TimerExpiredTask::TimedOut() {
+  if (process_)
+    KillProcess();
+}
+
+void TimerExpiredTask::OnObjectSignaled(HANDLE object) {
+  CloseHandle(process_);
+  process_ = NULL;
+}
+
+void TimerExpiredTask::KillProcess() {
+  // Stop watching the process handle since we're killing it.
+  watcher_.StopWatching();
+
+  // OK, time to get frisky.  We don't actually care when the process
+  // terminates.  We just care that it eventually terminates, and that's what
+  // TerminateProcess should do for us. Don't check for the result code since
+  // it fails quite often. This should be investigated eventually.
+  base::KillProcess(process_, kProcessKilledExitCode, false);
+
+  // Now, just cleanup as if the process exited normally.
+  OnObjectSignaled(process_);
+}
+
 }  // namespace
 
 ProcessId GetCurrentProcId() {
@@ -628,9 +634,11 @@ void EnsureProcessTerminated(ProcessHandle process) {
     return;
   }
 
-  MessageLoop::current()->PostDelayedTask(FROM_HERE,
-                                          new TimerExpiredTask(process),
-                                          kWaitInterval);
+  MessageLoop::current()->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(&TimerExpiredTask::TimedOut,
+                 base::Owned(new TimerExpiredTask(process))),
+      kWaitInterval);
 }
 
 ///////////////////////////////////////////////////////////////////////////////