Move favicon callbacks to favicon_base

chrome/browser/android/favicon_helper.cc

Index: chrome/browser/android/favicon_helper.cc
diff --git a/chrome/browser/android/favicon_helper.cc b/chrome/browser/android/favicon_helper.cc
index 07840d8704450a18038e5f5c06db54844b171f35..4ea0e89a1a695ce0295152ed5492b47a6ef86e24 100644
--- a/chrome/browser/android/favicon_helper.cc
+++ b/chrome/browser/android/favicon_helper.cc
@@ -125,7 +125,7 @@ jboolean FaviconHelper::GetLocalFaviconImageForURL(
       new ScopedJavaGlobalRef<jobject>();
   j_scoped_favicon_callback->Reset(env, j_favicon_image_callback);
 
-  FaviconService::FaviconImageCallback callback_runner = base::Bind(
+  favicon_base::FaviconImageCallback callback_runner = base::Bind(
       &OnLocalFaviconAvailable, base::Owned(j_scoped_favicon_callback));
 
   favicon_service->GetFaviconImageForURL(
@@ -161,7 +161,7 @@ void FaviconHelper::GetLargestRawFaviconForUrl(
       new ScopedJavaGlobalRef<jobject>();
   j_scoped_favicon_callback->Reset(env, j_favicon_image_callback);
 
-  FaviconService::FaviconRawCallback callback_runner = base::Bind(
+  favicon_base::FaviconRawCallback callback_runner = base::Bind(
       &OnFaviconBitmapResultAvailable, base::Owned(j_scoped_favicon_callback));
   favicon_service->GetLargestRawFaviconForURL(
       profile,