Add interface to CancelableRequest that allows use of base::Callback<>.

chrome/browser/icon_manager.h

Index: chrome/browser/icon_manager.h
diff --git a/chrome/browser/icon_manager.h b/chrome/browser/icon_manager.h
index 3b3b594f3ed1644f5884d31e51b21a008608ca19..6cc13b25b7114093a7395082e98d994ab75822b5 100644
--- a/chrome/browser/icon_manager.h
+++ b/chrome/browser/icon_manager.h
@@ -71,7 +71,8 @@ class IconManager : public IconLoader::Delegate,
                          IconLoader::IconSize size);
 
   typedef CancelableRequestProvider::Handle Handle;
-  typedef Callback2<Handle, gfx::Image*>::Type IconRequestCallback;
+  typedef Callback2<Handle, gfx::Image*>::Type OldIconRequestCallback;

[brettw, 2011/10/01 16:26:12]

It looks like you don't use this and you can just delete it.

[awong, 2011/10/03 05:18:39]

Done.

+  typedef base::Callback<void(Handle, gfx::Image*)> IconRequestCallback;
 
   // Asynchronous call to lookup and return the icon associated with file. The
   // work is done on the file thread, with the callbacks running on the UI
@@ -82,7 +83,7 @@ class IconManager : public IconLoader::Delegate,
   Handle LoadIcon(const FilePath& file_name,
                   IconLoader::IconSize size,
                   CancelableRequestConsumerBase* consumer,
-                  IconRequestCallback* callback);
+                  const IconRequestCallback& callback);
 
   // IconLoader::Delegate interface.
   virtual bool OnImageLoaded(IconLoader* source, gfx::Image* result);