Convert IconManager to use new CancelableTaskTracker

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_ITEM_GTK_H_
 #define CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_ITEM_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/icon_manager.h"
+#include "chrome/common/cancelable_task_tracker.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
 
 class DownloadItemModel;
 class DownloadShelfContextMenuGtk;
@@ skipping 28 matching lines @@
   // ui::AnimationDelegate implementation.
   virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Called when the icon manager has finished loading the icon. We take
   // ownership of |icon_bitmap|.
-  void OnLoadSmallIconComplete(IconManager::Handle handle,
-                               gfx::Image* image);
-  void OnLoadLargeIconComplete(IconManager::Handle handle,
-                               gfx::Image* image);
+  void OnLoadSmallIconComplete(gfx::Image* image);
+  void OnLoadLargeIconComplete(gfx::Image* image);
 
   // Returns the DownloadItem model object belonging to this item.
   content::DownloadItem* get_download();
 
  private:
   friend class DownloadShelfContextMenuGtk;
 
   // Functions for controlling the progress animation.
   // Repaint the download progress.
   void UpdateDownloadProgress();
@@ skipping 149 matching lines @@
 
   // The last download file path for which we requested an icon.
   FilePath icon_filepath_;
 
   content::NotificationRegistrar registrar_;
 
   // The time at which we were insantiated.
   base::Time creation_time_;
 
   // For canceling an in progress icon request.
-  CancelableRequestConsumerT<int, 0> icon_consumer_;
+  CancelableTaskTracker cancelable_task_tracker_;
 
   // Indicates when the download has completed, so we don't redo
   // on-completion actions.
   bool download_complete_;
 
   // Whether we are currently disabled as part of opening the downloaded file.
   bool disabled_while_opening_;
 
   // Method factory used to delay reenabling of the item when opening the
   // downloaded file.
   base::WeakPtrFactory<DownloadItemGtk> weak_ptr_factory_;
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_ITEM_GTK_H_