Move favicon callbacks to favicon_base

chrome/browser/favicon/favicon_handler_unittest.cc

Index: chrome/browser/favicon/favicon_handler_unittest.cc
diff --git a/chrome/browser/favicon/favicon_handler_unittest.cc b/chrome/browser/favicon/favicon_handler_unittest.cc
index bf590d59e40dace96873bb3d3f60ee5044666193..8a3c4e52de2c3de17ab9b072f4701f4c60016986 100644
--- a/chrome/browser/favicon/favicon_handler_unittest.cc
+++ b/chrome/browser/favicon/favicon_handler_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/favicon/favicon_handler.h"
+#include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ -135,7 +136,7 @@ class HistoryRequestHandler {
   HistoryRequestHandler(const GURL& page_url,
                         const GURL& icon_url,
                         int icon_type,
-                        const FaviconService::FaviconResultsCallback& callback)
+                        const favicon_base::FaviconResultsCallback& callback)
       : page_url_(page_url),
         icon_url_(icon_url),
         icon_type_(icon_type),
@@ -163,7 +164,7 @@ class HistoryRequestHandler {
   const std::vector<unsigned char> bitmap_data_;
   const gfx::Size size_;
   std::vector<favicon_base::FaviconBitmapResult> history_results_;
-  FaviconService::FaviconResultsCallback callback_;
+  favicon_base::FaviconResultsCallback callback_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HistoryRequestHandler);
@@ -293,7 +294,7 @@ class TestFaviconHandler : public FaviconHandler {
       const GURL& page_url,
       const GURL& icon_url,
       favicon_base::IconType icon_type,
-      const FaviconService::FaviconResultsCallback& callback,
+      const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker) OVERRIDE {
     history_handler_.reset(new HistoryRequestHandler(page_url, icon_url,
                                                      icon_type, callback));
@@ -302,7 +303,7 @@ class TestFaviconHandler : public FaviconHandler {
   virtual void GetFaviconFromFaviconService(
       const GURL& icon_url,
       favicon_base::IconType icon_type,
-      const FaviconService::FaviconResultsCallback& callback,
+      const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker) OVERRIDE {
     history_handler_.reset(new HistoryRequestHandler(GURL(), icon_url,
                                                      icon_type, callback));
@@ -311,7 +312,7 @@ class TestFaviconHandler : public FaviconHandler {
   virtual void GetFaviconForURLFromFaviconService(
       const GURL& page_url,
       int icon_types,
-      const FaviconService::FaviconResultsCallback& callback,
+      const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker) OVERRIDE {
     history_handler_.reset(new HistoryRequestHandler(page_url, GURL(),
                                                      icon_types, callback));
@@ -1004,7 +1005,7 @@ TEST_F(FaviconHandlerTest, UpdateDuringDownloading) {
   // Reset the history_handler to verify whether favicon is request from
   // history.
   // Save the callback for late use.
-  FaviconService::FaviconResultsCallback callback = history_handler->callback_;
+  favicon_base::FaviconResultsCallback callback = history_handler->callback_;
   helper.set_history_handler(NULL);
 
   // Simulates download succeed.