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

chrome/browser/history/history_backend.h

Index: chrome/browser/history/history_backend.h
diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h
index 17ab4eb3e3f4bc5088945b11c3180a2ebc3b08bd..ce817651cb97975b2eab2703d03ea2cef6567adb 100644
--- a/chrome/browser/history/history_backend.h
+++ b/chrome/browser/history/history_backend.h
@@ -23,7 +23,6 @@
 #include "chrome/browser/history/visit_tracker.h"
 #include "components/search_engines/template_url_id.h"
 #include "sql/init_status.h"
-#include "ui/base/layout.h"
 
 class TestingProfile;
 class TypedUrlSyncableService;
@@ -223,7 +222,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
       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,
       std::vector<favicon_base::FaviconRawBitmapResult>* bitmap_results);
 
   void GetLargestFaviconForURL(
@@ -236,13 +235,13 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
       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,
       std::vector<favicon_base::FaviconRawBitmapResult>* bitmap_results);
 
   void GetFaviconForID(
       favicon_base::FaviconID favicon_id,
       int desired_size_in_dip,
-      ui::ScaleFactor desired_scale_factor,
+      float desired_favicon_scale,
       std::vector<favicon_base::FaviconRawBitmapResult>* bitmap_results);
 
   void UpdateFaviconMappingsAndFetch(
@@ -250,7 +249,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
       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,
       std::vector<favicon_base::FaviconRawBitmapResult>* bitmap_results);
 
   void MergeFavicon(const GURL& page_url,
@@ -659,7 +658,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
       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,
       std::vector<favicon_base::FaviconRawBitmapResult>* results);
 
   // Set the favicon bitmaps for |icon_id|.
@@ -694,7 +693,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   // Returns true if there are favicons for |page_url| and one of the types in
   // |icon_types|.
   // |favicon_bitmap_results| is set to the favicon bitmaps which most closely
-  // match |desired_size_in_dip| and |desired_scale_factors|. If
+  // match |desired_size_in_dip| and |desired_favicon_scales|. If
   // |desired_size_in_dip| is 0, the largest favicon bitmap with one of the icon
   // types in |icon_types| is returned. If |icon_types| contains multiple icon
   // types and there are several matched icon types in the database, results
@@ -702,16 +701,15 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   // TOUCH_PRECOMPOSED_ICON, TOUCH_ICON, and FAVICON. See the comment for
   // GetFaviconResultsForBestMatch() for more details on how
   // |favicon_bitmap_results| is constructed.
-  bool GetFaviconsFromDB(
-      const GURL& page_url,
-      int icon_types,
-      const int desired_size_in_dip,
-      const std::vector<ui::ScaleFactor>& desired_scale_factors,
-      std::vector<favicon_base::FaviconRawBitmapResult>*
-          favicon_bitmap_results);
+  bool GetFaviconsFromDB(const GURL& page_url,
+                         int icon_types,
+                         const int desired_size_in_dip,
+                         const std::vector<float>& desired_favicon_scales,
+                         std::vector<favicon_base::FaviconRawBitmapResult>*
+                             favicon_bitmap_results);
 
   // Returns the favicon bitmaps which most closely match |desired_size_in_dip|
-  // and |desired_scale_factors| in |favicon_bitmap_results|. If
+  // and |desired_favicon_scales| in |favicon_bitmap_results|. If
   // |desired_size_in_dip| is 0, only the largest favicon bitmap is returned.
   // Goodness is computed via SelectFaviconBitmapIDs(). It is computed on a
   // per favicon id basis, thus all |favicon_bitmap_results| are guaranteed to
@@ -722,7 +720,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   bool GetFaviconBitmapResultsForBestMatch(
       const std::vector<favicon_base::FaviconID>& candidate_favicon_ids,
       int desired_size_in_dip,
-      const std::vector<ui::ScaleFactor>& desired_scale_factors,
+      const std::vector<float>& desired_favicon_scales,
       std::vector<favicon_base::FaviconRawBitmapResult>*
           favicon_bitmap_results);