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 8725267a5d815794ca8d8766de36f31948ed7523..fcd6ee1df75e644ed2fefd7144ee9259b3b17822 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;
@@ -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);
 
@@ -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);
 
@@ -225,7 +224,7 @@ class FaviconService : public KeyedService {
   // and GetFaviconForPageURL().
   base::CancelableTaskTracker::TaskId GetFaviconForPageURLImpl(
       const FaviconForPageURLParams& params,
-      const std::vector<ui::ScaleFactor>& desired_scale_factors,
+      const std::vector<float>& desired_favicon_scale,
       const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker);
 
@@ -246,7 +245,7 @@ class FaviconService : public KeyedService {
   void RunFaviconRawBitmapCallbackWithBitmapResults(
       const favicon_base::FaviconRawBitmapCallback& callback,
       int desired_size_in_dip,
-      ui::ScaleFactor desired_scale_factor,
+      float desired_favicon_scale,
       const std::vector<favicon_base::FaviconRawBitmapResult>&
           favicon_bitmap_results);