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

components/favicon_base/favicon_util.h

Index: components/favicon_base/favicon_util.h
diff --git a/components/favicon_base/favicon_util.h b/components/favicon_base/favicon_util.h
index ee59428c22469de6de3f3b6707a7f3de798acc4a..0bd85ad6f12a13c3a8ac55707fb45b771608d886 100644
--- a/components/favicon_base/favicon_util.h
+++ b/components/favicon_base/favicon_util.h
@@ -16,13 +16,13 @@ class Image;
 
 namespace favicon_base {
 
-// Returns the scale factors at which favicons should be fetched. This is
-// different from ui::GetSupportedScaleFactors() because clients which do
-// not support 1x should still fetch a favicon for 1x to push to sync. This
-// guarantees that the clients receiving sync updates pushed by this client
-// receive a favicon (potentially of the wrong scale factor) and do not show
-// the default favicon.
-std::vector<ui::ScaleFactor> GetFaviconScaleFactors();
+// Returns the scale at which favicons should be fetched. This is
+// different from scales derived from ui::GetSupportedScaleFactors()

[pkotwicz, 2014/06/18 15:46:33]

Nit: scales from (not scales derived from)

"scales retrieved from" is also ok

[oshima, 2014/06/18 17:17:19]

Done.

+// because clients which do not support 1x should still fetch a
+// favicon for 1x to push to sync. This guarantees that the clients
+// receiving sync updates pushed by this client receive a favicon
+// (potentially of the wrong scale factor) and do not show the default
+std::vector<float> GetFaviconScales();
 
 // Sets the color space used for converting |image| to an NSImage to the
 // system colorspace. This makes the favicon look the same in the browser UI
@@ -33,7 +33,7 @@ void SetFaviconColorSpace(gfx::Image* image);
 // a favicon of size favicon_size (in DIPs) at the desired ui scale factors.
 gfx::Image SelectFaviconFramesFromPNGs(
     const std::vector<favicon_base::FaviconRawBitmapResult>& png_data,
-    const std::vector<ui::ScaleFactor>& scale_factors,
+    const std::vector<float>& favicon_scales,
     int favicon_size);
 
 }  // namspace favicon_base