base::Bind: Convert chrome_frame/.

chrome_frame/test/win_event_receiver.cc

 // Copyright (c) 2010 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 "chrome_frame/test/win_event_receiver.h"
 
+#include "base/bind.h"
 #include "base/logging.h"
+#include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/win/object_watcher.h"
 #include "base/string_util.h"
-
 #include "chrome_frame/function_stub.h"
 
 // WinEventReceiver methods
 WinEventReceiver::WinEventReceiver()
     : listener_(NULL),
       hook_(NULL),
       hook_stub_(NULL) {
 }
 
 WinEventReceiver::~WinEventReceiver() {
@@ skipping 64 matching lines @@
   virtual ~ProcessExitObserver();
 
   // base::ObjectWatcher::Delegate implementation
   virtual void OnObjectSignaled(HANDLE process_handle);
 
  private:
   WindowWatchdog* window_watchdog_;
   HANDLE process_handle_;
   HWND hwnd_;
 
-  ScopedRunnableMethodFactory<ProcessExitObserver> method_task_factory_;
+  base::WeakPtrFactory<ProcessExitObserver> weak_factory_;
   base::win::ObjectWatcher object_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(ProcessExitObserver);
 };
 
 WindowWatchdog::ProcessExitObserver::ProcessExitObserver(
     WindowWatchdog* window_watchdog, HWND hwnd)
     : window_watchdog_(window_watchdog),
       process_handle_(NULL),
       hwnd_(hwnd),
-      ALLOW_THIS_IN_INITIALIZER_LIST(method_task_factory_(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   DWORD pid = 0;
   ::GetWindowThreadProcessId(hwnd, &pid);
   if (pid != 0) {
     process_handle_ = ::OpenProcess(SYNCHRONIZE, FALSE, pid);
   }
 
   if (process_handle_ != NULL) {
     object_watcher_.StartWatching(process_handle_, this);
   } else {
     // Process is gone, so the window must be gone too. Notify our observer!
     MessageLoop::current()->PostTask(
-        FROM_HERE,
-        method_task_factory_.NewRunnableMethod(
-            &ProcessExitObserver::OnObjectSignaled, HANDLE(NULL)));
+        FROM_HERE, base::Bind(&ProcessExitObserver::OnObjectSignaled,
+                              weak_factory_.GetWeakPtr(), HANDLE(NULL)));
   }
 }
 
 WindowWatchdog::ProcessExitObserver::~ProcessExitObserver() {
   if (process_handle_ != NULL) {
     ::CloseHandle(process_handle_);
   }
 }
 
 void WindowWatchdog::ProcessExitObserver::OnObjectSignaled(
@@ skipping 134 matching lines @@
     HandleOnOpen(hwnd);
   } else {
     DCHECK(event == EVENT_OBJECT_DESTROY || event == EVENT_OBJECT_HIDE);
     HandleOnClose(hwnd);
   }
 }
 
 void WindowWatchdog::OnHwndProcessExited(HWND hwnd) {
   HandleOnClose(hwnd);
 }