base::Bind: Complete cleanup of history/.

BUG=none
TEST=none

R=csilv@chromium.org

Review URL: http://codereview.chromium.org/8163005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104597 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 7 deletions

diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h
index 2062239..4fb313b 100644
--- a/chrome/browser/favicon/favicon_service.h
+++ b/chrome/browser/favicon/favicon_service.h
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "base/callback_old.h"
+#include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/task.h"
@@ -40,9 +40,10 @@ class FaviconService : public CancelableRequestProvider {
   // opposed to not knowing anything). |expired| will be set to true if we
   // refreshed the favicon "too long" ago and should be updated if the page
   // is visited again.
-  typedef Callback2<Handle,                             // handle
-                    history::FaviconData>::Type  // the type of favicon
-                    FaviconDataCallback;
+  typedef base::Callback<
+      void(Handle,  // handle
+           history::FaviconData)>  // the type of favicon
+      FaviconDataCallback;
 
   typedef CancelableRequest<FaviconDataCallback> GetFaviconRequest;
 
@@ -52,7 +53,7 @@ class FaviconService : public CancelableRequestProvider {
   Handle GetFavicon(const GURL& icon_url,
                     history::IconType icon_type,
                     CancelableRequestConsumerBase* consumer,
-                    FaviconDataCallback* callback);
+                    const FaviconDataCallback& callback);
 
   // Fetches the |icon_type| of favicon at |icon_url|, sending the results to
   // the given |callback|. If the favicon has previously been set via
@@ -63,7 +64,7 @@ class FaviconService : public CancelableRequestProvider {
                                       const GURL& icon_url,
                                       history::IconType icon_type,
                                       CancelableRequestConsumerBase* consumer,
-                                      FaviconDataCallback* callback);
+                                      const FaviconDataCallback& callback);
 
   // Requests any |icon_types| of favicon for a web page URL. |consumer| is
   // notified when the bits have been fetched. |icon_types| can be any
@@ -76,7 +77,7 @@ class FaviconService : public CancelableRequestProvider {
   Handle GetFaviconForURL(const GURL& page_url,
                           int icon_types,
                           CancelableRequestConsumerBase* consumer,
-                          FaviconDataCallback* callback);
+                          const FaviconDataCallback& callback);
 
   // Marks all types of favicon for the page as being out of date.
   void SetFaviconOutOfDateForPage(const GURL& page_url);