Revert 168079 - This CL ensures that favicons always

chrome/browser/favicon/favicon_handler.cc

Index: chrome/browser/favicon/favicon_handler.cc
===================================================================
--- chrome/browser/favicon/favicon_handler.cc	(revision 168086)
+++ chrome/browser/favicon/favicon_handler.cc	(working copy)
@@ -314,7 +314,7 @@
     const std::vector<history::FaviconBitmapResult>& favicon_bitmap_results) {
   gfx::Image resized_image = FaviconUtil::SelectFaviconFramesFromPNGs(
       favicon_bitmap_results,
-      FaviconUtil::GetFaviconScaleFactors(),
+      ui::GetSupportedScaleFactors(),
       preferred_icon_size());
   if (!resized_image.IsEmpty())
     UpdateFavicon(entry, &resized_image);
@@ -412,8 +412,7 @@
              DoUrlAndIconMatch(*current_candidate(), image_url,
                                i->second.icon_type)) {
     float score = 0.0f;
-    std::vector<ui::ScaleFactor> scale_factors =
-        FaviconUtil::GetFaviconScaleFactors();
+    std::vector<ui::ScaleFactor> scale_factors = ui::GetSupportedScaleFactors();
     gfx::Image image(SelectFaviconFrames(bitmaps, scale_factors, requested_size,
                                          &score));
 
@@ -472,7 +471,8 @@
   std::vector<GURL> icon_urls;
   icon_urls.push_back(icon_url);
   GetFaviconService()->UpdateFaviconMappingsAndFetch(page_url, icon_urls,
-      icon_type, preferred_icon_size(), consumer, callback);
+      icon_type, preferred_icon_size(), ui::GetSupportedScaleFactors(),
+      consumer, callback);
 }
 
 void FaviconHandler::GetFavicon(
@@ -481,7 +481,7 @@
     CancelableRequestConsumerBase* consumer,
     const FaviconService::FaviconResultsCallback& callback) {
   GetFaviconService()->GetFavicon(icon_url, icon_type, preferred_icon_size(),
-      consumer, callback);
+      ui::GetSupportedScaleFactors(), consumer, callback);
 }
 
 void FaviconHandler::GetFaviconForURL(
@@ -492,7 +492,7 @@
   GetFaviconService()->GetFaviconForURL(
       FaviconService::FaviconForURLParams(profile_, page_url, icon_types,
                                           preferred_icon_size(), consumer),
-                                          callback);
+      ui::GetSupportedScaleFactors(), callback);
 }
 
 void FaviconHandler::SetHistoryFavicons(const GURL& page_url,