Convert IconManager to use new CancelableTaskTracker

chrome/browser/ui/gtk/download/download_item_gtk.cc

 // Copyright (c) 2012 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/gtk/download/download_item_gtk.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
@@ skipping 265 matching lines @@
 
   complete_animation_.SetTweenType(ui::Tween::LINEAR);
   complete_animation_.SetSlideDuration(kCompleteAnimationDurationMs);
 }
 
 DownloadItemGtk::~DownloadItemGtk() {
   // First close the menu and then destroy the GtkWidgets. Bug#97724
   if (menu_.get())
     menu_.reset();
 
-  icon_consumer_.CancelAllRequests();
   StopDownloadProgress();
   get_download()->RemoveObserver(this);
 
   // We may free some shelf space for showing more download items.
   parent_shelf_->MaybeShowMoreDownloadItems();
 
   hbox_.Destroy();
   progress_area_.Destroy();
   body_.Destroy();
   dangerous_hbox_.Destroy();
@@ skipping 148 matching lines @@
       base::TimeDelta::FromMilliseconds(download_util::kProgressRateMs), this,
       &DownloadItemGtk::UpdateDownloadProgress);
 }
 
 void DownloadItemGtk::StopDownloadProgress() {
   progress_timer_.Stop();
 }
 
 // Icon loading functions.
 
-void DownloadItemGtk::OnLoadSmallIconComplete(IconManager::Handle handle,
-                                              gfx::Image* image) {
+void DownloadItemGtk::OnLoadSmallIconComplete(gfx::Image* image) {
   icon_small_ = image;
   gtk_widget_queue_draw(progress_area_.get());
 }
 
-void DownloadItemGtk::OnLoadLargeIconComplete(IconManager::Handle handle,
-                                              gfx::Image* image) {
+void DownloadItemGtk::OnLoadLargeIconComplete(gfx::Image* image) {
   icon_large_ = image;
   DownloadItemDrag::SetSource(body_.get(), get_download(), icon_large_);
 }
 
 void DownloadItemGtk::LoadIcon() {
-  icon_consumer_.CancelAllRequests();
+  cancelable_task_tracker_.TryCancelAll();
   IconManager* im = g_browser_process->icon_manager();
   icon_filepath_ = get_download()->GetUserVerifiedFilePath();
   im->LoadIcon(icon_filepath_,
-               IconLoader::SMALL, &icon_consumer_,
+               IconLoader::SMALL,
                base::Bind(&DownloadItemGtk::OnLoadSmallIconComplete,
-                          base::Unretained(this)));
+                          base::Unretained(this)),
+               &cancelable_task_tracker_);
   im->LoadIcon(icon_filepath_,
-               IconLoader::LARGE, &icon_consumer_,
+               IconLoader::LARGE,
                base::Bind(&DownloadItemGtk::OnLoadLargeIconComplete,
-                          base::Unretained(this)));
+                          base::Unretained(this)),
+               &cancelable_task_tracker_);
 }
 
 void DownloadItemGtk::UpdateTooltip() {
   string16 tooltip_text =
       download_model_->GetTooltipText(gfx::Font(), kTooltipMaxWidth);
   gtk_widget_set_tooltip_text(body_.get(), UTF16ToUTF8(tooltip_text).c_str());
 }
 
 void DownloadItemGtk::UpdateNameLabel() {
   // TODO(estade): This is at best an educated guess, since we don't actually
@@ skipping 433 matching lines @@
   get_download()->DangerousDownloadValidated();
 }
 
 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button) {
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
                            base::Time::Now() - creation_time_);
   if (get_download()->IsPartialDownload())
     get_download()->Cancel(true);
   get_download()->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
 }