Convert IconManager to use new CancelableTaskTracker

chrome/browser/ui/webui/fileicon_source.h

Index: chrome/browser/ui/webui/fileicon_source.h
diff --git a/chrome/browser/ui/webui/fileicon_source.h b/chrome/browser/ui/webui/fileicon_source.h
index c9194a9ccb9e9dd9c9d7ba694a8f5aba7b869c4b..ef43f841cb4ffd289fff51a8dd484cfdec354888 100644
--- a/chrome/browser/ui/webui/fileicon_source.h
+++ b/chrome/browser/ui/webui/fileicon_source.h
@@ -10,6 +10,7 @@
 #include "base/file_path.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/common/cancelable_task_tracker.h"
 #include "ui/base/layout.h"
 
 namespace gfx {
@@ -30,11 +31,6 @@ class FileIconSource : public ChromeURLDataManager::DataSource {
 
   virtual std::string GetMimeType(const std::string&) const OVERRIDE;
 
-  // Called when favicon data is available from the history backend.
-  void OnFileIconDataAvailable(
-      IconManager::Handle request_handle,
-      gfx::Image* icon);
-
  protected:
   virtual ~FileIconSource();
 
@@ -56,8 +52,12 @@ class FileIconSource : public ChromeURLDataManager::DataSource {
     ui::ScaleFactor scale_factor;
   };
 
-  // Consumer for requesting file icons.
-  CancelableRequestConsumerTSimple<IconRequestDetails> cancelable_consumer_;
+  // Called when favicon data is available from the history backend.
+  void OnFileIconDataAvailable(const IconRequestDetails& details,
+                               gfx::Image* icon);
+
+  // Tracks tasks requesting file icons.
+  CancelableTaskTracker cancelable_task_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(FileIconSource);
 };