Rename FaviconBitmapXxx to FaviconRawBitmapXxx

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 4ea0e89a1a695ce0295152ed5492b47a6ef86e24..059fa244576e2b4ce93c888d3f671b599de62928 100644
--- a/chrome/browser/android/favicon_helper.cc
+++ b/chrome/browser/android/favicon_helper.cc
@@ -57,9 +57,9 @@ void OnLocalFaviconAvailable(
                                                j_icon_url.obj());
 }
 
-void OnFaviconBitmapResultAvailable(
+void OnFaviconRawBitmapResultAvailable(
     ScopedJavaGlobalRef<jobject>* j_favicon_image_callback,
-    const favicon_base::FaviconBitmapResult& favicon_bitmap_result) {
+    const favicon_base::FaviconRawBitmapResult& favicon_bitmap_result) {
   JNIEnv* env = AttachCurrentThread();
 
   // Convert favicon_image_result to java objects.
@@ -161,8 +161,9 @@ void FaviconHelper::GetLargestRawFaviconForUrl(
       new ScopedJavaGlobalRef<jobject>();
   j_scoped_favicon_callback->Reset(env, j_favicon_image_callback);
 
-  favicon_base::FaviconRawCallback callback_runner = base::Bind(
-      &OnFaviconBitmapResultAvailable, base::Owned(j_scoped_favicon_callback));
+  favicon_base::FaviconRawBitmapCallback callback_runner =
+      base::Bind(&OnFaviconRawBitmapResultAvailable,
+                 base::Owned(j_scoped_favicon_callback));
   favicon_service->GetLargestRawFaviconForURL(
       profile,
       GURL(ConvertJavaStringToUTF16(env, j_page_url)),