ui/views: Migrate usages of ScopedRunnableMethodFactory to base::WeakPtrFactory/base::Bind pair.

chrome/browser/ui/views/status_bubble_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/ui/views/status_bubble_views.h"
 
 #include <algorithm>
 
+#include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "third_party/skia/include/core/SkPaint.h"
@@ skipping 129 matching lines @@
   double GetCurrentOpacity();
   void SetOpacity(double opacity);
   void AnimateToState(double state);
   void AnimationEnded(const Animation* animation);
 
   virtual void OnPaint(gfx::Canvas* canvas);
 
   BubbleStage stage_;
   BubbleStyle style_;
 
-  ScopedRunnableMethodFactory<StatusBubbleViews::StatusView> timer_factory_;
+  base::WeakPtrFactory<StatusBubbleViews::StatusView> timer_factory_;
 
   // Manager, owns us.
   StatusBubble* status_bubble_;
 
   // Handle to the widget that contains us.
   views::Widget* popup_;
 
   // The currently-displayed text.
   string16 text_;
 
@@ skipping 33 matching lines @@
 void StatusBubbleViews::StatusView::Hide() {
   Stop();
   CancelTimer();
   SetOpacity(0.0);
   text_.clear();
   popup_->Hide();
   stage_ = BUBBLE_HIDDEN;
 }
 
 void StatusBubbleViews::StatusView::StartTimer(int time) {
-  if (!timer_factory_.empty())
-    timer_factory_.RevokeAll();
+  if (timer_factory_.HasWeakPtrs())
+    timer_factory_.InvalidateWeakPtrs();
 
-  MessageLoop::current()->PostDelayedTask(FROM_HERE,
-      timer_factory_.NewRunnableMethod(&StatusBubbleViews::StatusView::OnTimer),
+  MessageLoop::current()->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(&StatusBubbleViews::StatusView::OnTimer,
+                timer_factory_.GetWeakPtr()),
       time);
 }
 
 void StatusBubbleViews::StatusView::OnTimer() {
   if (stage_ == BUBBLE_HIDING_TIMER) {
     stage_ = BUBBLE_HIDING_FADE;
     StartFade(1.0, 0.0, kHideFadeDurationMS);
   } else if (stage_ == BUBBLE_SHOWING_TIMER) {
     stage_ = BUBBLE_SHOWING_FADE;
     StartFade(0.0, 1.0, kShowFadeDurationMS);
   }
 }
 
 void StatusBubbleViews::StatusView::CancelTimer() {
-  if (!timer_factory_.empty())
-    timer_factory_.RevokeAll();
+  if (timer_factory_.HasWeakPtrs())
+    timer_factory_.InvalidateWeakPtrs();
 }
 
 void StatusBubbleViews::StatusView::RestartTimer(int delay) {
   CancelTimer();
   StartTimer(delay);
 }
 
 void StatusBubbleViews::StatusView::ResetTimer() {
   if (stage_ == BUBBLE_SHOWING_TIMER) {
     // We hadn't yet begun showing anything when we received a new request
@@ skipping 418 matching lines @@
   if (IsFrameVisible()) {
     view_->SetText(url_text_, true);
 
     CancelExpandTimer();
 
     // If bubble is already in expanded state, shift to adjust to new text
     // size (shrinking or expanding). Otherwise delay.
     if (is_expanded_ && !url.is_empty())
       ExpandBubble();
     else if (original_url_text.length() > url_text_.length())
-      MessageLoop::current()->PostDelayedTask(FROM_HERE,
-          expand_timer_factory_.NewRunnableMethod(
-          &StatusBubbleViews::ExpandBubble), kExpandHoverDelay);
+      MessageLoop::current()->PostDelayedTask(
+          FROM_HERE,
+          base::Bind(&StatusBubbleViews::ExpandBubble,
+                     expand_timer_factory_.GetWeakPtr()),
+          kExpandHoverDelay);
   }
 }
 
 void StatusBubbleViews::Hide() {
   status_text_ = string16();
   url_text_ = string16();
   if (view_)
     view_->Hide();
 }
 
@@ skipping 139 matching lines @@
       views::NativeScrollBar::GetVerticalScrollBarWidth()));
 }
 
 void StatusBubbleViews::SetBubbleWidth(int width) {
   size_.set_width(width);
   SetBounds(original_position_.x(), original_position_.y(),
             size_.width(), size_.height());
 }
 
 void StatusBubbleViews::CancelExpandTimer() {
-  if (!expand_timer_factory_.empty())
-    expand_timer_factory_.RevokeAll();
+  if (expand_timer_factory_.HasWeakPtrs())
+    expand_timer_factory_.InvalidateWeakPtrs();
 }