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..555e04233053d768aac44ad890251e09054153e1 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;
@@ -51,9 +50,9 @@ class FaviconService : public KeyedService {
 
   // The first argument of |callback| is a |const FaviconImageResult&|. Of which
   // |FaviconImageResult::image| is constructed from the bitmaps for the
-  // passed in URL and icon types which most which closely match the passed in
-  // |desired_size_in_dip| at the scale factors supported by the current
-  // platform (eg MacOS) in addition to 1x.
+  // passed in URL and icon types which most wich closely match the passed in
+  // |desired_size_in_dip| at the resource scale factors supported by the
+  // current platform (eg MacOS) in addition to 1x.
   // |FaviconImageResult::icon_url| is the favicon that the favicon bitmaps in
   // |image| originate from.
   // TODO(pkotwicz): Enable constructing |image| from bitmaps from several
@@ -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 resource scale factors supported by the
   // current platform (eg MacOS) are requested for GetFaviconImage().
   base::CancelableTaskTracker::TaskId GetFaviconImage(
       const GURL& icon_url,
@@ -78,16 +77,17 @@ 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);
 
   // The first argument for |callback| is the set of bitmaps for the passed in
   // URL and icon types whose pixel sizes best match the passed in
-  // |desired_size_in_dip| at the scale factors supported by the current
-  // platform (eg MacOS) in addition to 1x. The vector has at most one result
-  // for each of the scale factors. There are less entries if a single result
-  // is the best bitmap to use for several scale factors.
+  // |desired_size_in_dip| at the resource scale factors supported by the
+  // current platform (eg MacOS) in addition to 1x. The vector has at most one
+  // result for each of the resource scale factors. There are less entries if a
+  // single/ result is the best bitmap to use for several resource scale
+  // factors.
   base::CancelableTaskTracker::TaskId GetFavicon(
       const GURL& icon_url,
       favicon_base::IconType icon_type,
@@ -111,9 +111,9 @@ class FaviconService : public KeyedService {
   // |icon_types| can only have multiple IconTypes if
   // |icon_types| == TOUCH_ICON | TOUCH_PRECOMPOSED_ICON.
   // The favicon bitmaps which most closely match |desired_size_in_dip|
-  // at the scale factors supported by the current platform (eg MacOS) in
-  // addition to 1x from the favicons which were just mapped to |page_url| are
-  // returned. If |desired_size_in_dip| is 0, the largest favicon bitmap is
+  // at the reosurce scale factors supported by the current platform (eg MacOS)
+  // in addition to 1x from the favicons which were just mapped to |page_url|
+  // are returned. If |desired_size_in_dip| is 0, the largest favicon bitmap is
   // returned.
   base::CancelableTaskTracker::TaskId UpdateFaviconMappingsAndFetch(
       const GURL& page_url,
@@ -124,13 +124,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 resource scale factors
   // supported by the current platform (eg MacOS) are requested for
   // GetFaviconImageForPageURL().
   // Note. |callback| is always run asynchronously.
@@ -141,7 +141,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);