Remove custom Task implementation from process_util_win.cc.

base/process_util_win.cc

 // Copyright (c) 2011 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.
 
 #include "base/process_util.h"
 
 #include <fcntl.h>
 #include <io.h>
 #include <windows.h>
 #include <userenv.h>
 #include <psapi.h>
 
 #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"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/sys_info.h"
 #include "base/win/object_watcher.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
@@ skipping 76 matching lines @@
 
 void OnNoMemory() {
   // Kill the process. This is important for security, since WebKit doesn't
   // NULL-check many memory allocations. If a malloc fails, returns NULL, and
   // the buffer is then used, it provides a handy mapping of memory starting at
   // address 0 for an attacker to utilize.
   __debugbreak();
   _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);
-  }
+  explicit TimerExpiredTask(ProcessHandle process);
+  ~TimerExpiredTask();
 
-  virtual ~TimerExpiredTask() {
-    if (process_) {
-      KillProcess();
-      DCHECK(!process_) << "Make sure to close the handle.";
-    }
-  }
-
-  // Task ---------------------------------------------------------------------
-
-  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_;
 
   win::ObjectWatcher watcher_;
 
   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() {
   return ::GetCurrentProcessId();
 }
 
 ProcessHandle GetCurrentProcessHandle() {
   return ::GetCurrentProcess();
 }
 
@@ skipping 448 matching lines @@
 
 void EnsureProcessTerminated(ProcessHandle process) {
   DCHECK(process != GetCurrentProcess());
 
   // If already signaled, then we are done!
   if (WaitForSingleObject(process, 0) == WAIT_OBJECT_0) {
     CloseHandle(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);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ProcesMetrics
 
 ProcessMetrics::ProcessMetrics(ProcessHandle process)
     : process_(process),
       processor_count_(base::SysInfo::NumberOfProcessors()),
       last_time_(0),
       last_system_time_(0) {
@@ skipping 340 matching lines @@
 
   PERFORMANCE_INFORMATION info;
   if (!InternalGetPerformanceInfo(&info, sizeof(info))) {
     DLOG(ERROR) << "Failed to fetch internal performance info.";
     return 0;
   }
   return (info.CommitTotal * system_info.dwPageSize) / 1024;
 }
 
 }  // namespace base