Rename function names in LargeIconService.

This CL renames 2 functions LargeIconService. This is a prerequisite
work for adding
LargeIconService::GetLargeIconRawBitmapOrFallbackStyleForIconUrl in
this CL(http://crrev/c/1384366).

Bug: 903617,910525
Change-Id: Id46811309646955fd2b8888d829f94918e5b910a
Reviewed-on: https://chromium-review.googlesource.com/c/1429959
Commit-Queue: Yi Su <mrsuyi@chromium.org>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Reviewed-by: Mark Cogan <marq@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#625771}

chrome/browser/android/bookmarks/partner_bookmarks_reader.cc

@@ -259,7 +259,7 @@ void PartnerBookmarksReader::GetFaviconFromCacheOrServer(
     bool from_server,
     int desired_favicon_size_px,
     FaviconFetchedCallback callback) {
-  GetLargeIconService()->GetLargeIconOrFallbackStyle(
+  GetLargeIconService()->GetLargeIconRawBitmapOrFallbackStyleForPageUrl(
       page_url, kPartnerBookmarksMinimumFaviconSizePx, desired_favicon_size_px,
       base::Bind(&PartnerBookmarksReader::OnGetFaviconFromCacheFinished,
                  base::Unretained(this), page_url,

chrome/browser/android/large_icon_bridge.cc

@@ -22,12 +22,12 @@
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 
+using base::android::AttachCurrentThread;
+using base::android::ConvertJavaStringToUTF16;
 using base::android::JavaParamRef;
 using base::android::JavaRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
-using base::android::AttachCurrentThread;
-using base::android::ConvertJavaStringToUTF16;
 
 namespace {
 
@@ -40,8 +40,7 @@ void OnLargeIconAvailable(const JavaRef<jobject>& j_callback,
   ScopedJavaLocalRef<jobject> j_bitmap;
   if (result.bitmap.is_valid()) {
     gfx::PNGCodec::Decode(result.bitmap.bitmap_data->front(),
-                          result.bitmap.bitmap_data->size(),
-                          &bitmap);
+                          result.bitmap.bitmap_data->size(), &bitmap);
     if (!bitmap.isNull())
       j_bitmap = gfx::ConvertToJavaBitmap(&bitmap);
   }
@@ -62,11 +61,9 @@ static jlong JNI_LargeIconBridge_Init(JNIEnv* env) {
   return reinterpret_cast<intptr_t>(new LargeIconBridge());
 }
 
-LargeIconBridge::LargeIconBridge() {
-}
+LargeIconBridge::LargeIconBridge() {}
 
-LargeIconBridge::~LargeIconBridge() {
-}
+LargeIconBridge::~LargeIconBridge() {}
 
 void LargeIconBridge::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   delete this;
@@ -91,12 +88,11 @@ jboolean LargeIconBridge::GetLargeIconForURL(
   favicon_base::LargeIconCallback callback_runner = base::Bind(
       &OnLargeIconAvailable, ScopedJavaGlobalRef<jobject>(env, j_callback));
 
-  large_icon_service->GetLargeIconOrFallbackStyle(
-      GURL(ConvertJavaStringToUTF16(env, j_page_url)),
-      min_source_size_px,
-      0,  // Do not resize.
-      callback_runner,
-      &cancelable_task_tracker_);
+  // Use desired_size = 0 for getting the icon from the cache (so that
+  // the icon is not poorly rescaled by LargeIconService).
+  large_icon_service->GetLargeIconRawBitmapOrFallbackStyleForPageUrl(
+      GURL(ConvertJavaStringToUTF16(env, j_page_url)), min_source_size_px,
+      /*desired_size_in_pixel=*/0, callback_runner, &cancelable_task_tracker_);
 
   return true;
 }

chrome/browser/ui/app_list/search/internal_app_result.cc

@@ -105,7 +105,7 @@ void InternalAppResult::UpdateContinueReadingFavicon(
     // Desired size of the icon. If not available, a smaller one will be used.
     constexpr int min_source_size_in_pixel = 16;
     constexpr int desired_size_in_pixel = 32;
-    large_icon_service_->GetLargeIconImageOrFallbackStyle(
+    large_icon_service_->GetLargeIconImageOrFallbackStyleForPageUrl(
         url_for_continuous_reading_, min_source_size_in_pixel,
         desired_size_in_pixel,
         base::BindRepeating(&InternalAppResult::OnGetFaviconFromCacheFinished,

components/favicon/core/large_icon_service.h

@@ -40,8 +40,8 @@ class LargeIconService : public KeyedService {
   // - Returns the default fallback icon style.
   // For cases 4 and 5, this function returns the style of the fallback icon
   // instead of rendering an icon so clients can render the icon themselves.
-  // TODO(crbug.com/903617): Rename to GetLargeIconRawBitmapOrFallbackStyle.
-  virtual base::CancelableTaskTracker::TaskId GetLargeIconOrFallbackStyle(
+  virtual base::CancelableTaskTracker::TaskId
+  GetLargeIconRawBitmapOrFallbackStyleForPageUrl(
       const GURL& page_url,
       int min_source_size_in_pixel,
       int desired_size_in_pixel,
@@ -50,7 +50,8 @@ class LargeIconService : public KeyedService {
 
   // Behaves the same as GetLargeIconOrFallbackStyle(), only returns the large
   // icon (if available) decoded.
-  virtual base::CancelableTaskTracker::TaskId GetLargeIconImageOrFallbackStyle(
+  virtual base::CancelableTaskTracker::TaskId
+  GetLargeIconImageOrFallbackStyleForPageUrl(
       const GURL& page_url,
       int min_source_size_in_pixel,
       int desired_size_in_pixel,

components/favicon/core/large_icon_service_impl.cc

@@ -466,7 +466,7 @@ LargeIconServiceImpl::LargeIconServiceImpl(
 LargeIconServiceImpl::~LargeIconServiceImpl() {}
 
 base::CancelableTaskTracker::TaskId
-LargeIconServiceImpl::GetLargeIconOrFallbackStyle(
+LargeIconServiceImpl::GetLargeIconRawBitmapOrFallbackStyleForPageUrl(
     const GURL& page_url,
     int min_source_size_in_pixel,
     int desired_size_in_pixel,
@@ -478,7 +478,7 @@ LargeIconServiceImpl::GetLargeIconOrFallbackStyle(
 }
 
 base::CancelableTaskTracker::TaskId
-LargeIconServiceImpl::GetLargeIconImageOrFallbackStyle(
+LargeIconServiceImpl::GetLargeIconImageOrFallbackStyleForPageUrl(
     const GURL& page_url,
     int min_source_size_in_pixel,
     int desired_size_in_pixel,

components/favicon/core/large_icon_service_impl.h

@@ -36,13 +36,15 @@ class LargeIconServiceImpl : public LargeIconService {
   ~LargeIconServiceImpl() override;
 
   // LargeIconService Implementation.
-  base::CancelableTaskTracker::TaskId GetLargeIconOrFallbackStyle(
+  base::CancelableTaskTracker::TaskId
+  GetLargeIconRawBitmapOrFallbackStyleForPageUrl(
       const GURL& page_url,
       int min_source_size_in_pixel,
       int desired_size_in_pixel,
       const favicon_base::LargeIconCallback& callback,
       base::CancelableTaskTracker* tracker) override;
-  base::CancelableTaskTracker::TaskId GetLargeIconImageOrFallbackStyle(
+  base::CancelableTaskTracker::TaskId
+  GetLargeIconImageOrFallbackStyleForPageUrl(
       const GURL& page_url,
       int min_source_size_in_pixel,
       int desired_size_in_pixel,

components/favicon/core/large_icon_service_impl_unittest.cc

@@ -521,14 +521,14 @@ class LargeIconServiceGetterTest : public LargeIconServiceTest,
       int desired_size_in_pixel) {
     // Switch over testing two analogous functions based on the bool param.
     if (GetParam()) {
-      large_icon_service_.GetLargeIconOrFallbackStyle(
+      large_icon_service_.GetLargeIconRawBitmapOrFallbackStyleForPageUrl(
           page_url, min_source_size_in_pixel, desired_size_in_pixel,
           base::BindRepeating(
               &LargeIconServiceGetterTest::RawBitmapResultCallback,
               base::Unretained(this)),
           &cancelable_task_tracker_);
     } else {
-      large_icon_service_.GetLargeIconImageOrFallbackStyle(
+      large_icon_service_.GetLargeIconImageOrFallbackStyleForPageUrl(
           page_url, min_source_size_in_pixel, desired_size_in_pixel,
           base::BindRepeating(&LargeIconServiceGetterTest::ImageResultCallback,
                               base::Unretained(this)),

components/ntp_snippets/content_suggestions_service.cc

@@ -231,7 +231,7 @@ void ContentSuggestionsService::GetFaviconFromCache(
 
   // Use desired_size = 0 for getting the icon from the cache (so that the icon
   // is not poorly rescaled by LargeIconService).
-  large_icon_service_->GetLargeIconImageOrFallbackStyle(
+  large_icon_service_->GetLargeIconImageOrFallbackStyleForPageUrl(
       publisher_url, minimum_size_in_pixel, /*desired_size_in_pixel=*/0,
       base::Bind(&ContentSuggestionsService::OnGetFaviconFromCacheFinished,
                  base::Unretained(this), publisher_url, minimum_size_in_pixel,

components/ntp_tiles/icon_cacher_impl.cc

@@ -216,7 +216,7 @@ void IconCacherImpl::StartFetchMostLikely(const GURL& page_url,
 
   // Desired size 0 means that we do not want the service to resize the image
   // (as we will not use it anyway).
-  large_icon_service_->GetLargeIconOrFallbackStyle(
+  large_icon_service_->GetLargeIconRawBitmapOrFallbackStyleForPageUrl(
       page_url, GetMinimumFetchingSizeForChromeSuggestionsFaviconsFromServer(),
       /*desired_size_in_pixel=*/0,
       base::Bind(&IconCacherImpl::OnGetLargeIconOrFallbackStyleFinished,

ios/chrome/app/spotlight/base_spotlight_manager.mm

@@ -238,7 +238,7 @@ UIImage* GetFallbackImageWithStringAndColor(NSString* string,
   };
 
   base::CancelableTaskTracker::TaskId taskID =
-      _largeIconService->GetLargeIconOrFallbackStyle(
+      _largeIconService->GetLargeIconRawBitmapOrFallbackStyleForPageUrl(
           URL, kMinIconSize * [UIScreen mainScreen].scale,
           kIconSize * [UIScreen mainScreen].scale,
           base::BindRepeating(faviconBlock), &_largeIconTaskTracker);

ios/chrome/browser/favicon/favicon_loader.mm

@@ -140,7 +140,7 @@ FaviconAttributes* FaviconLoader::FaviconForUrl(
   CGFloat favicon_size_in_pixels = [UIScreen mainScreen].scale * size;
   CGFloat min_favicon_size = [UIScreen mainScreen].scale * min_size;
   DCHECK(large_icon_service_);
-  large_icon_service_->GetLargeIconOrFallbackStyle(
+  large_icon_service_->GetLargeIconRawBitmapOrFallbackStyleForPageUrl(
       block_url, min_favicon_size, favicon_size_in_pixels,
       base::BindRepeating(favicon_block), &cancelable_task_tracker_);
 

ios/chrome/browser/favicon/favicon_loader_unittest.mm

@@ -36,7 +36,8 @@ class FakeLargeIconService : public favicon::LargeIconServiceImpl {
   FakeLargeIconService()
       : favicon::LargeIconServiceImpl(/*favicon_service=*/nullptr,
                                       /*image_fetcher=*/nullptr) {}
-  base::CancelableTaskTracker::TaskId GetLargeIconOrFallbackStyle(
+  base::CancelableTaskTracker::TaskId
+  GetLargeIconRawBitmapOrFallbackStyleForPageUrl(
       const GURL& page_url,
       int min_source_size_in_pixel,
       int desired_size_in_pixel,

ios/chrome/browser/ui/favicon/favicon_attributes_provider.mm

@@ -106,7 +106,7 @@
   // Always call LargeIconService in case the favicon was updated.
   CGFloat faviconSize = [UIScreen mainScreen].scale * self.faviconSize;
   CGFloat minFaviconSize = [UIScreen mainScreen].scale * self.minSize;
-  self.largeIconService->GetLargeIconOrFallbackStyle(
+  self.largeIconService->GetLargeIconRawBitmapOrFallbackStyleForPageUrl(
       URL, minFaviconSize, faviconSize,
       base::BindRepeating(faviconBlockSaveToCache), &_faviconTaskTracker);
 }