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

chrome/browser/favicon/favicon_service.h

Index: chrome/browser/favicon/favicon_service.h
diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h
index 5387b5ed636fe0ba0fe974fc1e0159fbd5e9e13c..9557831758460ca5072074fb96a46dc806b9a225 100644
--- a/chrome/browser/favicon/favicon_service.h
+++ b/chrome/browser/favicon/favicon_service.h
@@ -14,7 +14,6 @@
 #include "components/favicon_base/favicon_callback.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/keyed_service/core/keyed_service.h"
-#include "ui/base/layout.h"
 
 class GURL;
 class HistoryService;
@@ -65,7 +64,7 @@ class FaviconService : public KeyedService {
   // bits have been fetched. |icon_url| is the URL of the icon itself, e.g.
   // <http://www.google.com/favicon.ico>.
   // Each of the three methods below differs in the format of the callback and
-  // the requested scale factors. All of the scale factors supported by the
+  // the requested scales. All of the scale factors supported by the

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

Find and replace 'scale factors' -> 'scales'

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

I intentionally left them as scale factors as they're ones defined in
GetSupoprtedScaleFactors not arbitrary scales. I changed it to "resource scale
factors" to be more explicit.

   // current platform (eg MacOS) are requested for GetFaviconImage().
   base::CancelableTaskTracker::TaskId GetFaviconImage(
       const GURL& icon_url,
@@ -78,7 +77,7 @@ class FaviconService : public KeyedService {
       const GURL& icon_url,
       favicon_base::IconType icon_type,
       int desired_size_in_dip,
-      ui::ScaleFactor desired_scale_factor,
+      float desired_favicon_scale,
       const favicon_base::FaviconRawBitmapCallback& callback,
       base::CancelableTaskTracker* tracker);
 
@@ -124,13 +123,13 @@ class FaviconService : public KeyedService {
       base::CancelableTaskTracker* tracker);
 
   // Requests the favicons of any of |icon_types| whose pixel sizes most
-  // closely match |desired_size_in_dip| and desired scale factors for a web
+  // closely match |desired_size_in_dip| and desired scale for a web
   // page URL. If |desired_size_in_dip| is 0, the largest favicon for the web
   // page URL is returned. |callback| is run when the bits have been fetched.
   // |icon_types| can be any combination of IconType value, but only one icon
   // will be returned in the priority of TOUCH_PRECOMPOSED_ICON, TOUCH_ICON and
   // FAVICON. Each of the three methods below differs in the format of the
-  // callback and the requested scale factors. All of the scale factors
+  // callback and the requested scales. All of the scale factors
   // supported by the current platform (eg MacOS) are requested for
   // GetFaviconImageForPageURL().
   // Note. |callback| is always run asynchronously.
@@ -141,7 +140,7 @@ class FaviconService : public KeyedService {
 
   base::CancelableTaskTracker::TaskId GetRawFaviconForPageURL(
       const FaviconForPageURLParams& params,
-      ui::ScaleFactor desired_scale_factor,
+      float desired_favicon_scale,
       const favicon_base::FaviconRawBitmapCallback& callback,
       base::CancelableTaskTracker* tracker);