base::Bind: Cleanup in automation.

chrome/browser/automation/testing_automation_provider_views.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 "chrome/browser/automation/testing_automation_provider.h"
 
+#include "base/bind.h"
+#include "base/memory/weak_ptr.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/automation/automation_browser_tracker.h"
 #include "chrome/browser/automation/automation_window_tracker.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/automation_messages.h"
 #include "ui/gfx/point.h"
 #include "views/controls/menu/menu_listener.h"
 #include "views/view.h"
 #include "views/widget/widget.h"
 
 namespace {
 
 // Helper class that waits until the focus has changed to a view other
 // than the one with the provided view id.
 class ViewFocusChangeWaiter : public views::FocusChangeListener {
  public:
   ViewFocusChangeWaiter(views::FocusManager* focus_manager,
                         int previous_view_id,
                         AutomationProvider* automation,
                         IPC::Message* reply_message)
       : focus_manager_(focus_manager),
         previous_view_id_(previous_view_id),
         automation_(automation),
         reply_message_(reply_message),
-        ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
+        ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
     focus_manager_->AddFocusChangeListener(this);
     // Call the focus change notification once in case the focus has
     // already changed.
     FocusWillChange(NULL, focus_manager_->GetFocusedView());
   }
 
   virtual ~ViewFocusChangeWaiter() {
     focus_manager_->RemoveFocusChangeListener(this);
   }
 
   // Inherited from FocusChangeListener
   virtual void FocusWillChange(views::View* focused_before,
                                views::View* focused_now) {
     // This listener is called before focus actually changes. Post a task
     // that will get run after focus changes.
     MessageLoop::current()->PostTask(
         FROM_HERE,
-        method_factory_.NewRunnableMethod(
-            &ViewFocusChangeWaiter::FocusChanged,
-            focused_before,
-            focused_now));
+        base::Bind(&ViewFocusChangeWaiter::FocusChanged,
+                   weak_factory_.GetWeakPtr(), focused_before, focused_now));
   }
 
  private:
   void FocusChanged(views::View* focused_before,
                     views::View* focused_now) {
     if (focused_now && focused_now->id() != previous_view_id_) {
       AutomationMsg_WaitForFocusedViewIDToChange::WriteReplyParams(
           reply_message_, true, focused_now->id());
 
       automation_->Send(reply_message_);
       delete this;
     }
   }
 
   views::FocusManager* focus_manager_;
   int previous_view_id_;
   AutomationProvider* automation_;
   IPC::Message* reply_message_;
-  ScopedRunnableMethodFactory<ViewFocusChangeWaiter> method_factory_;
+  base::WeakPtrFactory<ViewFocusChangeWaiter> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewFocusChangeWaiter);
 };
 
 }  // namespace
 
 class TestingAutomationProvider::PopupMenuWaiter : public views::MenuListener {
  public:
   PopupMenuWaiter(ToolbarView* toolbar_view,
                   TestingAutomationProvider* automation)
@@ skipping 108 matching lines @@
           reply_message, true);
     Send(reply_message);
     return;
   }
 
   // Otherwise, register this reply message with the waiter,
   // which will handle responding to this IPC when the popup
   // menu opens.
   popup_menu_waiter_->set_reply_message(reply_message);
 }