base::Bind() conversion for content/common/gpu and content/gpu

content/gpu/gpu_watchdog_thread.h

 // 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.
 
 #ifndef CONTENT_GPU_GPU_WATCHDOG_THREAD_H_
 #define CONTENT_GPU_GPU_WATCHDOG_THREAD_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
-#include "base/task.h"
 #include "base/threading/thread.h"
 #include "base/time.h"
 #include "content/common/gpu/gpu_watchdog.h"
 
 // A thread that intermitently sends tasks to a group of watched message loops
 // and deliberately crashes if one of them does not respond after a timeout.
 class GpuWatchdogThread : public base::Thread,
                           public GpuWatchdog,
                           public base::RefCountedThreadSafe<GpuWatchdogThread> {
  public:
@@ skipping 40 matching lines @@
   volatile bool armed_;
   GpuWatchdogTaskObserver task_observer_;
 
 #if defined(OS_WIN)
   void* watched_thread_handle_;
   int64 arm_cpu_time_;
 #endif
 
   base::Time arm_absolute_time_;
 
-  typedef ScopedRunnableMethodFactory<GpuWatchdogThread> MethodFactory;
-  scoped_ptr<MethodFactory> method_factory_;
+  base::WeakPtrFactory<GpuWatchdogThread> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuWatchdogThread);
 };
 
 #endif  // CONTENT_GPU_GPU_WATCHDOG_THREAD_H_