Rename FaviconBitmapXxx to FaviconRawBitmapXxx

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 39 matching lines @@
   if (!favicon_bitmap.isNull())
     j_favicon_bitmap = gfx::ConvertToJavaBitmap(&favicon_bitmap);
 
   // Call java side OnLocalFaviconAvailable method.
   Java_FaviconImageCallback_onFaviconAvailable(env,
                                                j_favicon_image_callback->obj(),
                                                j_favicon_bitmap.obj(),
                                                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.
   ScopedJavaLocalRef<jstring> j_icon_url =
       ConvertUTF8ToJavaString(env, favicon_bitmap_result.icon_url.spec());
 
   SkBitmap favicon_bitmap;
   if (favicon_bitmap_result.is_valid()) {
     gfx::PNGCodec::Decode(favicon_bitmap_result.bitmap_data->front(),
                           favicon_bitmap_result.bitmap_data->size(),
@@ skipping 36 matching lines @@
   DCHECK(profile);
   if (!profile)
     return false;
 
   FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
       profile, Profile::EXPLICIT_ACCESS);
   DCHECK(favicon_service);
   if (!favicon_service)
     return false;
 
-  FaviconService::FaviconForURLParams params(
+  FaviconService::FaviconForPageURLParams 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);
 
   favicon_base::FaviconImageCallback callback_runner = base::Bind(
       &OnLocalFaviconAvailable, base::Owned(j_scoped_favicon_callback));
 
-  favicon_service->GetFaviconImageForURL(
+  favicon_service->GetFaviconImageForPageURL(
       params, callback_runner,
       cancelable_task_tracker_.get());
 
   return true;
 }
 
 void FaviconHelper::GetLargestRawFaviconForUrl(
     JNIEnv* env,
     jobject obj,
     jobject j_profile,
@@ skipping 12 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);
 
-  favicon_base::FaviconRawCallback callback_runner = base::Bind(
-      &OnFaviconBitmapResultAvailable, base::Owned(j_scoped_favicon_callback));
-  favicon_service->GetLargestRawFaviconForURL(
+  favicon_base::FaviconRawBitmapCallback callback_runner =
+      base::Bind(&OnFaviconRawBitmapResultAvailable,
+                 base::Owned(j_scoped_favicon_callback));
+  favicon_service->GetLargestRawFaviconForPageURL(
       profile,
       GURL(ConvertJavaStringToUTF16(env, j_page_url)),
       icon_types,
       static_cast<int>(j_min_size_threshold_px),
       callback_runner,
       cancelable_task_tracker_.get());
 }
 
 ScopedJavaLocalRef<jobject> FaviconHelper::GetSyncedFaviconImageForURL(
     JNIEnv* env,
@@ skipping 38 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);
 }