Move favicon callbacks to favicon_base

chrome/browser/history/android/sqlite_cursor.cc

Index: chrome/browser/history/android/sqlite_cursor.cc
diff --git a/chrome/browser/history/android/sqlite_cursor.cc b/chrome/browser/history/android/sqlite_cursor.cc
index cde867401351788f98ee704ff7b8b02722a7d2b2..f570c7c52efeaebc41b64fcd9740f4b5da9500ec 100644
--- a/chrome/browser/history/android/sqlite_cursor.cc
+++ b/chrome/browser/history/android/sqlite_cursor.cc
@@ -9,6 +9,7 @@
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/logging.h"
+#include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/history/android/android_history_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/SQLiteCursor_jni.h"
@@ -202,7 +203,7 @@ bool SQLiteCursor::GetFavicon(favicon_base::FaviconID id,
 
 void SQLiteCursor::GetFaviconForIDInUIThread(
     favicon_base::FaviconID id,
-    const FaviconService::FaviconRawCallback& callback) {
+    const favicon_base::FaviconRawCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!tracker_.get())
     tracker_.reset(new base::CancelableTaskTracker());