Convert IconManager to use new CancelableTaskTracker

chrome/browser/ui/cocoa/download/download_item_mac.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_COCOA_DOWNLOAD_DOWNLOAD_ITEM_MAC_H_
 #define CHROME_BROWSER_UI_COCOA_DOWNLOAD_DOWNLOAD_ITEM_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/common/cancelable_request.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/download_manager.h"
 
 @class DownloadItemController;
 class DownloadItemModel;
 
 namespace gfx{
 class Image;
 }
 
@@ skipping 15 matching lines @@
   virtual void OnDownloadOpened(content::DownloadItem* download) OVERRIDE;
   virtual void OnDownloadDestroyed(content::DownloadItem* download) OVERRIDE;
 
   DownloadItemModel* download_model() { return download_model_.get(); }
 
   // Asynchronous icon loading support.
   void LoadIcon();
 
  private:
   // Callback for asynchronous icon loading.
-  void OnExtractIconComplete(IconManager::Handle handle,
-                             gfx::Image* icon_bitmap);
+  void OnExtractIconComplete(gfx::Image* icon_bitmap);
 
   // The download item model we represent.
   scoped_ptr<DownloadItemModel> download_model_;
 
   // The objective-c controller object.
   DownloadItemController* item_controller_;  // weak, owns us.
 
   // For canceling an in progress icon request.
-  CancelableRequestConsumerT<int, 0> icon_consumer_;
+  CancelableTaskTracker cancelable_task_tracker_;
 
   // Stores the last known path where the file will be saved.
   FilePath lastFilePath_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadItemMac);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_DOWNLOAD_DOWNLOAD_ITEM_MAC_H_