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

chrome/browser/history/history_service.h

Index: chrome/browser/history/history_service.h
diff --git a/chrome/browser/history/history_service.h b/chrome/browser/history/history_service.h
index 14fd3e63eda56fcd82a05478c474a31f3c1a8348..b1c8e8aa726deaccde27581c40e8a208f03f9810 100644
--- a/chrome/browser/history/history_service.h
+++ b/chrome/browser/history/history_service.h
@@ -37,7 +37,6 @@
 #include "content/public/common/page_transition_types.h"
 #include "sql/init_status.h"
 #include "sync/api/syncable_service.h"
-#include "ui/base/layout.h"
 
 #if defined(OS_ANDROID)
 class AndroidHistoryProviderService;
@@ -646,10 +645,10 @@ class HistoryService : public CancelableRequestProvider,
 
   // Used by FaviconService to get the favicon bitmaps from the history backend
   // which most closely match |desired_size_in_dip| x |desired_size_in_dip| and
-  // |desired_scale_factors| for |icon_types|. If |desired_size_in_dip| is 0,
+  // |desired_favicon_scales| for |icon_types|. If |desired_size_in_dip| is 0,
   // the largest favicon bitmap for |icon_types| is returned. The returned
   // FaviconBitmapResults will have at most one result for each of
-  // |desired_scale_factors|. If a favicon bitmap is determined to be the best
+  // |desired_favicon_scales|. If a favicon bitmap is determined to be the best
   // candidate for multiple scale factors there will be less results.
   // If |icon_types| has several types, results for only a single type will be
   // returned in the priority of TOUCH_PRECOMPOSED_ICON, TOUCH_ICON, and
@@ -658,15 +657,16 @@ class HistoryService : public CancelableRequestProvider,
       const std::vector<GURL>& icon_urls,
       int icon_types,
       int desired_size_in_dip,
-      const std::vector<ui::ScaleFactor>& desired_scale_factors,
+      const std::vector<float>& desired_favicon_scales,
       const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker);
 
   // Used by the FaviconService to get favicons mapped to |page_url| for
   // |icon_types| which most closely match |desired_size_in_dip| and
-  // |desired_scale_factors|. If |desired_size_in_dip| is 0, the largest favicon
+  // |desired_favicon_scales|. If |desired_size_in_dip| is 0, the largest
+  // favicon
   // bitmap for |icon_types| is returned. The returned FaviconBitmapResults will
-  // have at most one result for each of |desired_scale_factors|. If a favicon
+  // have at most one result for each of |desired_favicon_scales|. If a favicon
   // bitmap is determined to be the best candidate for multiple scale factors
   // there will be less results. If |icon_types| has several types, results for
   // only a single type will be returned in the priority of
@@ -675,7 +675,7 @@ class HistoryService : public CancelableRequestProvider,
       const GURL& page_url,
       int icon_types,
       int desired_size_in_dip,
-      const std::vector<ui::ScaleFactor>& desired_scale_factors,
+      const std::vector<float>& desired_favicon_scales,
       const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker);
 
@@ -698,13 +698,13 @@ class HistoryService : public CancelableRequestProvider,
       base::CancelableTaskTracker* tracker);
 
   // Used by the FaviconService to get the favicon bitmap which most closely
-  // matches |desired_size_in_dip| and |desired_scale_factor| from the favicon
+  // matches |desired_size_in_dip| and |desired_favicon_scale| from the favicon
   // with |favicon_id| from the history backend. If |desired_size_in_dip| is 0,
   // the largest favicon bitmap for |favicon_id| is returned.
   base::CancelableTaskTracker::TaskId GetFaviconForID(
       favicon_base::FaviconID favicon_id,
       int desired_size_in_dip,
-      ui::ScaleFactor desired_scale_factor,
+      float desired_favicon_scale,
       const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker);
 
@@ -724,7 +724,7 @@ class HistoryService : public CancelableRequestProvider,
   // |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|
-  // and |desired_scale_factors| from the favicons which were just mapped
+  // and |desired_favicon_scales| 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(
@@ -732,7 +732,7 @@ class HistoryService : public CancelableRequestProvider,
       const std::vector<GURL>& icon_urls,
       int icon_types,
       int desired_size_in_dip,
-      const std::vector<ui::ScaleFactor>& desired_scale_factors,
+      const std::vector<float>& desired_favicon_scales,
       const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker);