Convert ui::ScaleFactor -> float in favicon/history code

components/favicon_base/select_favicon_frames.h

Index: components/favicon_base/select_favicon_frames.h
diff --git a/components/favicon_base/select_favicon_frames.h b/components/favicon_base/select_favicon_frames.h
index 597a8f195e5bfbf46f9549a434a56e89889af689..3d2f0e08c406c3325eeed1f9afe7c27521f8b450 100644
--- a/components/favicon_base/select_favicon_frames.h
+++ b/components/favicon_base/select_favicon_frames.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "ui/base/layout.h"
+#include "base/basictypes.h"
 
 class SkBitmap;
 
@@ -34,12 +34,11 @@ extern const float kSelectFaviconFramesInvalidScore;
 // If the resampling algorithm is modified, the resampling done in
 // FaviconUtil::SelectFaviconFramesFromPNGs() should probably be modified too as
 // it inspired by this method.
-gfx::ImageSkia SelectFaviconFrames(
-    const std::vector<SkBitmap>& bitmaps,
-    const std::vector<gfx::Size>& original_sizes,
-    const std::vector<ui::ScaleFactor>& scale_factors,
-    int desired_size,
-    float* score);
+gfx::ImageSkia SelectFaviconFrames(const std::vector<SkBitmap>& bitmaps,
+                                   const std::vector<gfx::Size>& original_sizes,
+                                   const std::vector<float>& scales,
+                                   int desired_size,
+                                   float* score);
 
 // Takes a list of the pixel sizes of a favicon's favicon bitmaps and returns
 // the indices of the best sizes to use to create an ImageSkia that's
@@ -52,11 +51,10 @@ gfx::ImageSkia SelectFaviconFrames(
 // TODO(pkotwicz): Remove need to pass in |scale_factors|.
 // TODO(pkotwicz): Remove callers of this method for which |frame_pixel_sizes|
 // are the sizes of the favicon bitmaps after they were resized.
-void SelectFaviconFrameIndices(
-    const std::vector<gfx::Size>& frame_pixel_sizes,
-    const std::vector<ui::ScaleFactor>& scale_factors,
-    int desired_size,
-    std::vector<size_t>* best_indices,
-    float* score);
+void SelectFaviconFrameIndices(const std::vector<gfx::Size>& frame_pixel_sizes,
+                               const std::vector<float>& scales,
+                               int desired_size,
+                               std::vector<size_t>* best_indices,
+                               float* score);
 
 #endif  // COMPONENTS_FAVICON_BASE_SELECT_FAVICON_FRAMES_H_