Use Closure instead of ScopedRunnableMethodFactory in NetworkMenuButton.

chrome/browser/chromeos/status/network_menu_button.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/chromeos/status/network_menu_button.h"
 
 #include <algorithm>
 #include <limits>
+#include <vector>
 
+#include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
@@ skipping 73 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton
 
 NetworkMenuButton::NetworkMenuButton(StatusAreaHost* host)
     : StatusAreaButton(host, this),
       mobile_data_bubble_(NULL),
       is_browser_mode_(false),
       check_for_promo_(true),
       was_sim_locked_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   is_browser_mode_ = (host->GetScreenMode() == StatusAreaHost::kBrowserMode);
   network_menu_.reset(new NetworkMenu(this, is_browser_mode_));
   network_icon_.reset(
       new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE));
 
   NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
   OnNetworkManagerChanged(network_library);
   network_library->AddNetworkManagerObserver(this);
   network_library->AddCellularDataPlanObserver(this);
   const NetworkDevice* cellular = network_library->FindCellularDevice();
@@ skipping 264 matching lines @@
     // Contains() method for screen bounds works correctly.
     button_bounds.set_y(button_bounds.y() + 1);
     gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size()));
 
     // Chrome window is initialized in visible state off screen and then is
     // moved into visible screen area. Make sure that we're on screen
     // so that bubble is shown correctly.
     if (!screen_bounds.Contains(button_bounds)) {
       // If we're not on screen yet, delay notification display.
       // It may be shown earlier, on next NetworkLibrary callback processing.
-      if (method_factory_.empty()) {
+      if (!weak_ptr_factory_.HasWeakPtrs()) {
         MessageLoop::current()->PostDelayedTask(FROM_HERE,
-            method_factory_.NewRunnableMethod(
+            base::Bind(
                 &NetworkMenuButton::ShowOptionalMobileDataPromoNotification,
+                weak_ptr_factory_.GetWeakPtr(),
                 cros),
             kPromoShowDelayMs);
       }
       return;
     }
 
     // Add deal text if it's defined.
     std::wstring notification_text;
     std::wstring default_text =
         UTF16ToWide(l10n_util::GetStringUTF16(IDS_3G_NOTIFICATION_MESSAGE));
@@ skipping 31 matching lines @@
       SetCarrierDealPromoShown(carrier_deal_promo_pref + 1);
   }
 }
 
 void NetworkMenuButton::SetTooltipAndAccessibleName(const string16& label) {
   SetTooltipText(label);
   SetAccessibleName(label);
 }
 
 }  // namespace chromeos