Remove task.h and finish base::Bind() migration.

content/gpu/gpu_watchdog_thread.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.
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include "content/gpu/gpu_watchdog_thread.h"
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/process_util.h"
 #include "base/process.h"
 #include "build/build_config.h"
 #include "content/public/common/result_codes.h"
 
 namespace {
 const int64 kCheckPeriod = 2000;
-
-void DoNothing() {
-}
-}
+}  // namespace
 
 GpuWatchdogThread::GpuWatchdogThread(int timeout)
     : base::Thread("Watchdog"),
       watched_message_loop_(MessageLoop::current()),
       timeout_(timeout),
       armed_(false),
 #if defined(OS_WIN)
       watched_thread_handle_(0),
       arm_cpu_time_(0),
 #endif
@@ skipping 138 matching lines @@
   arm_cpu_time_ = GetWatchedThreadTime();
 #endif
 
   arm_absolute_time_ = base::Time::Now();
 
   // Post a task to the monitored thread that does nothing but wake up the
   // TaskObserver. Any other tasks that are pending on the watched thread will
   // also wake up the observer. This simply ensures there is at least one.
   watched_message_loop_->PostTask(
       FROM_HERE,
-      base::Bind(&DoNothing));
+      base::Bind(&base::DoNothing));
 
   // Post a task to the watchdog thread to exit if the monitored thread does
   // not respond in time.
   message_loop()->PostDelayedTask(
       FROM_HERE,
       base::Bind(
           &GpuWatchdogThread::DeliberatelyTerminateToRecoverFromHang,
           weak_factory_.GetWeakPtr()),
       timeout_);
 }
@@ skipping 39 matching lines @@
 #endif
 
   LOG(ERROR) << "The GPU process hung. Terminating after "
              << timeout_ << " ms.";
 
   base::Process current_process(base::GetCurrentProcessHandle());
   current_process.Terminate(content::RESULT_CODE_HUNG);
 
   terminated = true;
 }