Always select best favicon bitmap

components/favicon/core/favicon_service_impl.cc

Index: components/favicon/core/favicon_service_impl.cc
diff --git a/components/favicon/core/favicon_service_impl.cc b/components/favicon/core/favicon_service_impl.cc
index a57c99e9ce2f2f23032ad4049aa7653ccae49337..b951eb482eba9af1982bb9906c07395aa50e4b20 100644
--- a/components/favicon/core/favicon_service_impl.cc
+++ b/components/favicon/core/favicon_service_impl.cc
@@ -87,15 +87,15 @@ base::CancelableTaskTracker::TaskId FaviconServiceImpl::GetRawFavicon(
 base::CancelableTaskTracker::TaskId FaviconServiceImpl::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) {
   TRACE_EVENT0("browser", "FaviconServiceImpl::GetFavicon");
   std::vector<GURL> icon_urls;
   icon_urls.push_back(icon_url);
-  return history_service_->GetFavicons(
-      icon_urls, icon_type, GetPixelSizesForFaviconScales(desired_size_in_dip),
-      callback, tracker);
+  return history_service_->GetFavicons(icon_urls, icon_type,
+                                       desired_sizes_in_pixel, callback,
+                                       tracker);
 }
 
 base::CancelableTaskTracker::TaskId
@@ -153,13 +153,12 @@ FaviconServiceImpl::GetLargestRawFaviconForPageURL(
 base::CancelableTaskTracker::TaskId FaviconServiceImpl::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) {
   TRACE_EVENT0("browser", "FaviconServiceImpl::GetFaviconForPageURL");
-  return GetFaviconForPageURLImpl(
-      page_url, icon_types, GetPixelSizesForFaviconScales(desired_size_in_dip),
-      callback, tracker);
+  return GetFaviconForPageURLImpl(page_url, icon_types, desired_sizes_in_pixel,
+                                  callback, tracker);
 }
 
 base::CancelableTaskTracker::TaskId
@@ -167,12 +166,12 @@ FaviconServiceImpl::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) {
   return history_service_->UpdateFaviconMappingsAndFetch(
-      page_url, icon_urls, icon_types,
-      GetPixelSizesForFaviconScales(desired_size_in_dip), callback, tracker);
+      page_url, icon_urls, icon_types, desired_sizes_in_pixel, callback,
+      tracker);
 }
 
 base::CancelableTaskTracker::TaskId