base::Bind: More converts, mostly in WebUI.

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.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/webui/chromeos/login/signin_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/hash_tables.h"
@@ skipping 48 matching lines @@
 std::string SanitizeEmail(const std::string& email) {
   std::string sanitized(email);
 
   // Apply a default domain if necessary.
   if (sanitized.find('@') == std::string::npos)
     sanitized += kDefaultDomain;
 
   return sanitized;
 }
 
+// The Task posted to PostTaskAndReply in StartClearingDnsCache on the IO
+// thread.
+void ClearDnsCache(IOThread* io_thread) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  if (browser_shutdown::IsTryingToQuit())
+    return;
+
+  io_thread->globals()->dnsrr_resolver.get()->OnIPAddressChanged();
+}
+
 }  // namespace
 
 namespace chromeos {
 
-// Class which observes network state changes and calls registerd callbacks.
+// Class which observes network state changes and calls registered callbacks.
 // State is considered changed if connection or the active network has been
 // changed. Also, it answers to the requests about current network state.
 class NetworkStateInformer
     : public chromeos::NetworkLibrary::NetworkManagerObserver {
  public:
   explicit NetworkStateInformer(WebUI* web_ui);
   virtual ~NetworkStateInformer();
 
   // Adds observer's callback to be called when network state has been changed.
   void AddObserver(const std::string& callback);
@@ skipping 12 matching lines @@
 
   bool UpdateState(chromeos::NetworkLibrary* cros);
 
   base::hash_set<std::string> observers_;
   std::string active_network_;
   std::string network_name_;
   State state_;
   WebUI* web_ui_;
 };
 
-// Clears DNS cache on IO thread.
-class ClearDnsCacheTaskOnIOThread : public Task {
- public:
-  ClearDnsCacheTaskOnIOThread(Task* callback, IOThread* io_thread)
-      : callback_(callback), io_thread_(io_thread) {
-  }
-  virtual ~ClearDnsCacheTaskOnIOThread() {}
-
-  // Task overrides.
-  virtual void Run() OVERRIDE {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-    if (browser_shutdown::IsTryingToQuit())
-     return;
-
-    io_thread_->globals()->dnsrr_resolver.get()->OnIPAddressChanged();
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback_);
-  }
-
- private:
-  Task* callback_;
-  IOThread* io_thread_;
-  DISALLOW_COPY_AND_ASSIGN(ClearDnsCacheTaskOnIOThread);
-};
-
 // NetworkStateInformer implementation -----------------------------------------
 
 NetworkStateInformer::NetworkStateInformer(WebUI* web_ui) : web_ui_(web_ui) {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   UpdateState(cros);
   cros->AddNetworkManagerObserver(this);
 }
 
 NetworkStateInformer::~NetworkStateInformer() {
   CrosLibrary::Get()->GetNetworkLibrary()->
@@ skipping 52 matching lines @@
     : delegate_(WebUILoginDisplay::GetInstance()),
       show_on_init_(false),
       oobe_ui_(false),
       dns_cleared_(false),
       dns_clear_task_running_(false),
       cookies_cleared_(false),
       extension_driven_(
           CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kWebUILogin)),
       cookie_remover_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   delegate_->SetWebUIHandler(this);
 }
 
 SigninScreenHandler::~SigninScreenHandler() {
-  method_factory_.RevokeAll();
+  weak_factory_.InvalidateWeakPtrs();
   if (cookie_remover_)
     cookie_remover_->RemoveObserver(this);
 }
 
 void SigninScreenHandler::GetLocalizedStrings(
     DictionaryValue* localized_strings) {
   localized_strings->SetString("signinScreenTitle",
       l10n_util::GetStringUTF16(IDS_SIGNIN_SCREEN_TITLE));
   localized_strings->SetString("passwordHint",
       l10n_util::GetStringUTF16(IDS_LOGIN_POD_EMPTY_PASSWORD_TEXT));
@@ skipping 391 matching lines @@
 
 void SigninScreenHandler::HandleCreateAccount(const base::ListValue* args) {
   delegate_->CreateAccount();
 }
 
 void SigninScreenHandler::StartClearingDnsCache() {
   if (dns_clear_task_running_ || !g_browser_process->io_thread())
     return;
 
   dns_cleared_ = false;
-  ClearDnsCacheTaskOnIOThread* clear_dns_task = new ClearDnsCacheTaskOnIOThread(
-      method_factory_.NewRunnableMethod(&SigninScreenHandler::OnDnsCleared),
-      g_browser_process->io_thread());
-  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, clear_dns_task);
+  BrowserThread::PostTaskAndReply(
+      BrowserThread::IO, FROM_HERE,
+      base::Bind(&ClearDnsCache, g_browser_process->io_thread()),
+      base::Bind(&SigninScreenHandler::OnDnsCleared,
+                 weak_factory_.GetWeakPtr()));
   dns_clear_task_running_ = true;
 }
 
 void SigninScreenHandler::StartClearingCookies() {
   cookies_cleared_ = false;
   if (cookie_remover_)
     cookie_remover_->RemoveObserver(this);
 
   cookie_remover_ = new BrowsingDataRemover(
       Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context()),
       BrowsingDataRemover::EVERYTHING,
       base::Time());
   cookie_remover_->AddObserver(this);
   cookie_remover_->Remove(BrowsingDataRemover::REMOVE_SITE_DATA);
 }
 
 }  // namespace chromeos