Always select best favicon bitmap

components/favicon/core/favicon_service.h

Index: components/favicon/core/favicon_service.h
diff --git a/components/favicon/core/favicon_service.h b/components/favicon/core/favicon_service.h
index 10a8174747ea6890cb385dae6e1d2b2649ff97c1..025b48401a92b2d9829f3dde61a6e6dc9e4c864d 100644
--- a/components/favicon/core/favicon_service.h
+++ b/components/favicon/core/favicon_service.h
@@ -58,15 +58,13 @@ class FaviconService : public KeyedService {
 
   // The first argument for |callback| is the set of bitmaps for the passed in
   // URL and icon types whose pixel sizes best match the passed in
-  // |desired_size_in_dip| at the resource scale factors supported by the
-  // current platform (eg MacOS) in addition to 1x. The vector has at most one
-  // result for each of the resource scale factors. There are less entries if a
-  // single/ result is the best bitmap to use for several resource scale
-  // factors.
+  // |desired_sizes_in_pixel| The vector has at most one result for each of the
+  // desired sizes. There are less entries if a single/ result is the best
+  // bitmap to use for several desired sizes.
   virtual base::CancelableTaskTracker::TaskId GetFavicon(
       const GURL& icon_url,
       favicon_base::IconType icon_type,
-      int desired_size_in_dip,
+      const std::vector<int>& desired_sizes_in_pixel,
       const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker) = 0;
 
@@ -113,7 +111,7 @@ class FaviconService : public KeyedService {
   virtual base::CancelableTaskTracker::TaskId GetFaviconForPageURL(
       const GURL& page_url,
       int icon_types,
-      int desired_size_in_dip,
+      const std::vector<int>& desired_sizes_in_pixel,
       const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker) = 0;
 
@@ -132,16 +130,13 @@ class FaviconService : public KeyedService {
   //    Sample new mappings to |page_url|: { ICON_URL3 }
   // |icon_types| can only have multiple IconTypes if
   // |icon_types| == TOUCH_ICON | TOUCH_PRECOMPOSED_ICON.
-  // The favicon bitmaps which most closely match |desired_size_in_dip|
-  // at the reosurce scale factors supported by the current platform (eg MacOS)
-  // in addition to 1x from the favicons which were just mapped to |page_url|
-  // are returned. If |desired_size_in_dip| is 0, the largest favicon bitmap is
-  // returned.
+  // The favicon bitmaps which most closely match |desired_size_in_pixels|
+  // are returned.
   virtual base::CancelableTaskTracker::TaskId UpdateFaviconMappingsAndFetch(
       const GURL& page_url,
       const std::vector<GURL>& icon_urls,
       int icon_types,
-      int desired_size_in_dip,
+      const std::vector<int>& desired_sizes_in_pixel,
       const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker) = 0;