Move favicon callbacks to favicon_base

chrome/browser/android/favicon_helper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/favicon_helper.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 107 matching lines @@
 
   FaviconService::FaviconForURLParams params(
       GURL(ConvertJavaStringToUTF16(env, j_page_url)),
       static_cast<int>(j_icon_types),
       static_cast<int>(j_desired_size_in_dip));
 
   ScopedJavaGlobalRef<jobject>* j_scoped_favicon_callback =
       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(
       params, callback_runner,
       cancelable_task_tracker_.get());
 
   return true;
 }
 
 void FaviconHelper::GetLargestRawFaviconForUrl(
@@ skipping 15 matching lines @@
   if (!favicon_service)
     return;
 
   std::vector<int> icon_types;
   base::android::JavaIntArrayToIntVector(env, j_icon_types, &icon_types);
 
   ScopedJavaGlobalRef<jobject>* j_scoped_favicon_callback =
       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,
       GURL(ConvertJavaStringToUTF16(env, j_page_url)),
       icon_types,
       static_cast<int>(j_min_size_threshold_px),
       callback_runner,
       cancelable_task_tracker_.get());
 }
 
@@ skipping 40 matching lines @@
 
     gfx::JavaBitmap bitmap_lock(bitmap);
     SkBitmap skbitmap = gfx::CreateSkBitmapFromJavaBitmap(bitmap_lock);
     return color_utils::CalculateKMeanColorOfBitmap(skbitmap);
 }
 
 // static
 bool FaviconHelper::RegisterFaviconHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }