Fix Bind usage in imageburner.

chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.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/imageburner/imageburner_ui.h"
-#include "chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h"
+
+#include <string>
+#include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
-#include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 13 matching lines @@
 
 // 3.9GB. It is less than 4GB because true device size ussually varies a little.
 const uint64 kMinDeviceSize = static_cast<uint64>(3.9) * 1000 * 1000 * 1000;
 
 // Link displayed on imageburner ui.
 const char kMoreInfoLink[] =
     "http://www.chromium.org/chromium-os/chromiumos-design-docs/recovery-mode";
 
 namespace {
 
-ChromeWebUIDataSource *CreateImageburnerUIHTMLSource() {
-  ChromeWebUIDataSource *source =
+ChromeWebUIDataSource* CreateImageburnerUIHTMLSource() {
+  ChromeWebUIDataSource* source =
       new ChromeWebUIDataSource(chrome::kChromeUIImageBurnerHost);
 
     source->AddLocalizedString("headerTitle", IDS_IMAGEBURN_HEADER_TITLE);
     source->AddLocalizedString("headerDescription",
                                IDS_IMAGEBURN_HEADER_DESCRIPTION);
     source->AddLocalizedString("headerLink", IDS_IMAGEBURN_HEADER_LINK);
     source->AddLocalizedString("statusDevicesNone",
                                IDS_IMAGEBURN_NO_DEVICES_STATUS);
     source->AddLocalizedString("warningDevicesNone",
                                IDS_IMAGEBURN_NO_DEVICES_WARNING);
@@ skipping 82 matching lines @@
   if (state_machine_)
     state_machine_->RemoveObserver(this);
 }
 
 WebUIMessageHandler* WebUIHandler::Attach(WebUI* web_ui) {
   return WebUIMessageHandler::Attach(web_ui);
 }
 
 void WebUIHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("getDevices",
-      base::Bind(&WebUIHandler::HandleGetDevices, base::Unretained(this)));
+      base::Bind(&WebUIHandler::HandleGetDevices,
+          base::SupportsWeakPtr<WebUIHandler>::AsWeakPtr()));
   web_ui_->RegisterMessageCallback("burnImage",
-      base::Bind(&WebUIHandler::HandleBurnImage, base::Unretained(this)));
+      base::Bind(&WebUIHandler::HandleBurnImage,
+          base::SupportsWeakPtr<WebUIHandler>::AsWeakPtr()));
   web_ui_->RegisterMessageCallback("cancelBurnImage",
-      base::Bind(&WebUIHandler::HandleCancelBurnImage, base::Unretained(this)));
+      base::Bind(&WebUIHandler::HandleCancelBurnImage,
+          base::SupportsWeakPtr<WebUIHandler>::AsWeakPtr()));
   web_ui_->RegisterMessageCallback("webuiInitialized",
       base::Bind(&WebUIHandler::HandleWebUIInitialized,
-                 base::Unretained(this)));
+          base::SupportsWeakPtr<WebUIHandler>::AsWeakPtr()));
 }

[csilv, 2011/11/23 01:39:02]

As discussed in http://codereview.chromium.org/8113018/, not necessary.  I
recommend reverting this section.

[achuithb, 2011/11/23 19:43:29]

Done.

 
 void WebUIHandler::DiskChanged(
     chromeos::disks::DiskMountManagerEventType event,
     const chromeos::disks::DiskMountManager::Disk* disk) {
   if (!disk->is_parent() || disk->on_boot_device())
     return;
   if (event == chromeos::disks::MOUNT_DISK_ADDED) {
     DictionaryValue disk_value;
     CreateDiskValue(*disk, &disk_value);
     web_ui_->CallJavascriptFunction("browserBridge.deviceAdded", disk_value);
@@ skipping 179 matching lines @@
     return;
   working_ = true;
   // Send progress signal now so ui doesn't hang in intial state until we get
   // config file
   SendProgressSignal(DOWNLOAD, 0, 0, NULL);
   if (burn_manager_->GetImageDir().empty()) {
     // Create image dir on File thread.
     scoped_refptr<WebUIHandlerTaskProxy> task = new WebUIHandlerTaskProxy(this);
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
-        NewRunnableMethod(task.get(), &WebUIHandlerTaskProxy::CreateImageDir));
+        base::Bind(&WebUIHandlerTaskProxy::CreateImageDir, task));

[csilv, 2011/11/23 01:39:02]

You'll still want to use task.get() here.

[achuithb, 2011/11/23 19:43:29]

Done.

   } else {
     ImageDirCreatedOnUIThread(true);
   }
 }
 
 void WebUIHandler::CreateImageDirOnFileThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   burn_manager_->CreateImageDir(this);
 }
 
 void WebUIHandler::OnImageDirCreated(bool success) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   // Transfer to UI thread.
   scoped_refptr<WebUIHandlerTaskProxy> task = new WebUIHandlerTaskProxy(this);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(task.get(), &WebUIHandlerTaskProxy::OnImageDirCreated,
-                        success));
+      base::Bind(&WebUIHandlerTaskProxy::OnImageDirCreated, task, success));

[csilv, 2011/11/23 01:39:02]

task.get()

[achuithb, 2011/11/23 19:43:29]

Done.

 }
 
 void WebUIHandler::ImageDirCreatedOnUIThread(bool success) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (success) {
     zip_image_file_path_ =
         burn_manager_->GetImageDir().Append(kImageZipFileName);
     burn_manager_->FetchConfigFile(tab_contents_, this);
   } else {
     DownloadCompleted(success);
@@ skipping 247 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ImageBurnUI::ImageBurnUI(TabContents* contents) : ChromeWebUI(contents) {
   imageburner::WebUIHandler* handler = new imageburner::WebUIHandler(contents);
   AddMessageHandler((handler)->Attach(this));
 
   Profile* profile = Profile::FromBrowserContext(contents->browser_context());
   profile->GetChromeURLDataManager()->AddDataSource(
       CreateImageburnerUIHTMLSource());
 }