Revert 168079 - This CL ensures that favicons always

chrome/browser/favicon/favicon_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/favicon/favicon_util.h"
 
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/select_favicon_frames.h"
 #include "chrome/common/icon_messages.h"
 #include "content/public/browser/render_view_host.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image_skia.h"
 
 // static
-std::vector<ui::ScaleFactor> FaviconUtil::GetFaviconScaleFactors() {
-  const float kScale1x = ui::GetScaleFactorScale(ui::SCALE_FACTOR_100P);
-  std::vector<ui::ScaleFactor> favicon_scale_factors =
-      ui::GetSupportedScaleFactors();
-
-  // The scale factors returned from ui::GetSupportedScaleFactors() are sorted.
-  // Insert the 1x scale factor such that GetFaviconScaleFactors() is sorted as
-  // well.
-  size_t insert_index = favicon_scale_factors.size();
-  for (size_t i = 0; i < favicon_scale_factors.size(); ++i) {
-    float scale = ui::GetScaleFactorScale(favicon_scale_factors[i]);
-    if (scale == kScale1x) {
-      return favicon_scale_factors;
-    } else if (scale > kScale1x) {
-      insert_index = i;
-      break;
-    }
-  }
-  favicon_scale_factors.insert(favicon_scale_factors.begin() + insert_index,
-                               ui::SCALE_FACTOR_100P);
-  return favicon_scale_factors;
-}
-
-// static
 int FaviconUtil::DownloadFavicon(content::RenderViewHost* rvh,
                                  const GURL& url,
                                  int image_size) {
   static int id = 0;
   rvh->Send(new IconMsg_DownloadFavicon(rvh->GetRoutingID(), ++id, url,
             image_size));
   return id;
 }
 // static
 gfx::Image FaviconUtil::SelectFaviconFramesFromPNGs(
@@ skipping 10 matching lines @@
                               png_data[i].bitmap_data->size(),
                               &bitmap)) {
       bitmaps.push_back(bitmap);
     }
   }
 
   if (bitmaps.empty())
     return gfx::Image();
 
   gfx::ImageSkia resized_image_skia = SelectFaviconFrames(bitmaps,
-      scale_factors, favicon_size, NULL);
+      ui::GetSupportedScaleFactors(), favicon_size, NULL);
   return gfx::Image(resized_image_skia);
 }