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

components/favicon_base/favicon_util.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_FAVICON_BASE_FAVICON_UTIL_H_
 #define COMPONENTS_FAVICON_BASE_FAVICON_UTIL_H_
 
 #include <vector>
 
 #include "components/favicon_base/favicon_types.h"
-#include "ui/base/layout.h"
 
 namespace gfx {
 class Image;
 }
 
 namespace favicon_base {
 
-// Returns the scale factors at which favicons should be fetched. This is
+// Returns the scales 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();
+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
 // as it does in the renderer.
 void SetFaviconColorSpace(gfx::Image* image);
 
 // Takes a vector of png-encoded frames, decodes them, and converts them to
 // a favicon of size favicon_size (in DIPs) at the desired ui scale factors.

[pkotwicz, 2014/06/20 00:35:41]

I think that this is a better comment:
"Takes a vector of PNG-encoded data, and converts it to a gfx::Image of size
|favicon_size| in DIPs. The return gfx::Image has an entry for each of
|favicon_scales|.

[oshima, 2014/06/20 04:16:34]

Updated to the slightly modified version.

[pkotwicz, 2014/06/20 14:22:36]

This method does not always decode the PNG encoded data which is why I was keen
on removing the "decodes them" part.

[oshima, 2014/06/20 15:21:50]

I see, done.

 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
 
 #endif  // COMPONENTS_FAVICON_BASE_FAVICON_UTIL_H_