[Refactor] Change FaviconService API to take in a desired pixel size

chrome/browser/favicon/favicon_service.cc

Index: chrome/browser/favicon/favicon_service.cc
diff --git a/chrome/browser/favicon/favicon_service.cc b/chrome/browser/favicon/favicon_service.cc
index d9f18ba55c814692f47f72ee4f2adc786db93ce8..ab331cfa4719e10934a89320f017c6672f09f910 100644
--- a/chrome/browser/favicon/favicon_service.cc
+++ b/chrome/browser/favicon/favicon_service.cc
@@ -92,20 +92,18 @@ void FaviconService::FaviconResultsCallbackRunner(
 
 base::CancelableTaskTracker::TaskId FaviconService::GetFaviconImage(
     const GURL& icon_url,
-    favicon_base::IconType icon_type,
-    int desired_size_in_dip,
     const favicon_base::FaviconImageCallback& callback,
     base::CancelableTaskTracker* tracker) {
   favicon_base::FaviconResultsCallback callback_runner =
       Bind(&FaviconService::RunFaviconImageCallbackWithBitmapResults,
-           base::Unretained(this), callback, desired_size_in_dip);
+           base::Unretained(this), callback, gfx::kFaviconSize);
   if (history_service_) {
     std::vector<GURL> icon_urls;
     icon_urls.push_back(icon_url);
     return history_service_->GetFavicons(
         icon_urls,
-        icon_type,
-        GetPixelSizesForFaviconScales(desired_size_in_dip),
+        favicon_base::FAVICON,
+        GetPixelSizesForFaviconScales(gfx::kFaviconSize),
         callback_runner,
         tracker);
   }
@@ -115,12 +113,9 @@ base::CancelableTaskTracker::TaskId FaviconService::GetFaviconImage(
 base::CancelableTaskTracker::TaskId FaviconService::GetRawFavicon(
     const GURL& icon_url,
     favicon_base::IconType icon_type,
-    int desired_size_in_dip,
-    float desired_favicon_scale,
+    int desired_size_in_pixel,
     const favicon_base::FaviconRawBitmapCallback& callback,
     base::CancelableTaskTracker* tracker) {
-  int desired_size_in_pixel =
-      std::ceil(desired_size_in_dip * desired_favicon_scale);
   favicon_base::FaviconResultsCallback callback_runner =
       Bind(&FaviconService::RunFaviconRawBitmapCallbackWithBitmapResults,
            base::Unretained(this),
@@ -158,51 +153,32 @@ base::CancelableTaskTracker::TaskId FaviconService::GetFavicon(
   return RunWithEmptyResultAsync(callback, tracker);
 }
 
-base::CancelableTaskTracker::TaskId
-FaviconService::UpdateFaviconMappingsAndFetch(
-    const GURL& page_url,
-    const std::vector<GURL>& icon_urls,
-    int icon_types,
-    int desired_size_in_dip,
-    const favicon_base::FaviconResultsCallback& callback,
-    base::CancelableTaskTracker* tracker) {
-  if (history_service_) {
-    return history_service_->UpdateFaviconMappingsAndFetch(
-        page_url,
-        icon_urls,
-        icon_types,
-        GetPixelSizesForFaviconScales(desired_size_in_dip),
-        callback,
-        tracker);
-  }
-  return RunWithEmptyResultAsync(callback, tracker);
-}
-
 base::CancelableTaskTracker::TaskId FaviconService::GetFaviconImageForPageURL(
-    const FaviconForPageURLParams& params,
+    const GURL& page_url,
     const favicon_base::FaviconImageCallback& callback,
     base::CancelableTaskTracker* tracker) {
   return GetFaviconForPageURLImpl(
-      params,
-      GetPixelSizesForFaviconScales(params.desired_size_in_dip),
+      page_url,
+      favicon_base::FAVICON,
+      GetPixelSizesForFaviconScales(gfx::kFaviconSize),
       Bind(&FaviconService::RunFaviconImageCallbackWithBitmapResults,
            base::Unretained(this),
            callback,
-           params.desired_size_in_dip),
+           gfx::kFaviconSize),
       tracker);
 }
 
 base::CancelableTaskTracker::TaskId FaviconService::GetRawFaviconForPageURL(
-    const FaviconForPageURLParams& params,
-    float desired_favicon_scale,
+    const GURL& page_url,
+    int icon_types,
+    int desired_size_in_pixel,
     const favicon_base::FaviconRawBitmapCallback& callback,
     base::CancelableTaskTracker* tracker) {
-  int desired_size_in_pixel =
-      std::ceil(params.desired_size_in_dip * desired_favicon_scale);
   std::vector<int> desired_sizes_in_pixel;
   desired_sizes_in_pixel.push_back(desired_size_in_pixel);
   return GetFaviconForPageURLImpl(
-      params,
+      page_url,
+      icon_types,
       desired_sizes_in_pixel,
       Bind(&FaviconService::RunFaviconRawBitmapCallbackWithBitmapResults,
            base::Unretained(this),
@@ -241,16 +217,40 @@ FaviconService::GetLargestRawFaviconForPageURL(
 }
 
 base::CancelableTaskTracker::TaskId FaviconService::GetFaviconForPageURL(
-    const FaviconForPageURLParams& params,
+    const GURL& page_url,
+    int icon_types,
+    int desired_size_in_dip,
     const favicon_base::FaviconResultsCallback& callback,
     base::CancelableTaskTracker* tracker) {
   return GetFaviconForPageURLImpl(
-      params,
-      GetPixelSizesForFaviconScales(params.desired_size_in_dip),
+      page_url,
+      icon_types,
+      GetPixelSizesForFaviconScales(desired_size_in_dip),
       callback,
       tracker);
 }
 
+base::CancelableTaskTracker::TaskId
+FaviconService::UpdateFaviconMappingsAndFetch(
+    const GURL& page_url,
+    const std::vector<GURL>& icon_urls,
+    int icon_types,
+    int desired_size_in_dip,
+    const favicon_base::FaviconResultsCallback& callback,
+    base::CancelableTaskTracker* tracker) {
+  if (history_service_) {
+    return history_service_->UpdateFaviconMappingsAndFetch(
+        page_url,
+        icon_urls,
+        icon_types,
+        GetPixelSizesForFaviconScales(desired_size_in_dip),
+        callback,
+        tracker);
+  }
+  return RunWithEmptyResultAsync(callback, tracker);
+}
+
+

[sky, 2014/07/10 00:03:39]

nit: onlye one newline.

 base::CancelableTaskTracker::TaskId FaviconService::GetLargestRawFaviconForID(
     favicon_base::FaviconID favicon_id,
     const favicon_base::FaviconRawBitmapCallback& callback,
@@ -355,18 +355,19 @@ void FaviconService::ClearUnableToDownloadFavicons() {
 FaviconService::~FaviconService() {}
 
 base::CancelableTaskTracker::TaskId FaviconService::GetFaviconForPageURLImpl(
-    const FaviconForPageURLParams& params,
+    const GURL& page_url,
+    int icon_types,
     const std::vector<int>& desired_sizes_in_pixel,
     const favicon_base::FaviconResultsCallback& callback,
     base::CancelableTaskTracker* tracker) {
-  if (params.page_url.SchemeIs(content::kChromeUIScheme) ||
-      params.page_url.SchemeIs(extensions::kExtensionScheme)) {
+  if (page_url.SchemeIs(content::kChromeUIScheme) ||
+      page_url.SchemeIs(extensions::kExtensionScheme)) {
     return GetFaviconForChromeURL(
-        profile_, params.page_url, desired_sizes_in_pixel, callback, tracker);
+        profile_, page_url, desired_sizes_in_pixel, callback, tracker);
   }
   if (history_service_) {
-    return history_service_->GetFaviconsForURL(params.page_url,
-                                               params.icon_types,
+    return history_service_->GetFaviconsForURL(page_url,
+                                               icon_types,
                                                desired_sizes_in_pixel,
                                                callback,
                                                tracker);