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

chrome/browser/ui/webui/chrome_web_ui_controller_factory.h

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.h
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h
index dfd55987c514056e6ad32d4aaaf2278d94250ec2..9e61f863f2868eec9aa5d52425513ca709d352ad 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h
@@ -10,7 +10,6 @@
 #include "components/favicon_base/favicon_callback.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_controller_factory.h"
-#include "ui/base/layout.h"
 
 class Profile;
 
@@ -36,7 +35,7 @@ class ChromeWebUIControllerFactory : public content::WebUIControllerFactory {
   void GetFaviconForURL(
       Profile* profile,
       const GURL& page_url,
-      const std::vector<ui::ScaleFactor>& scale_factors,
+      const std::vector<float>& favicon_scales,
       const favicon_base::FaviconResultsCallback& callback) const;
 
   static ChromeWebUIControllerFactory* GetInstance();
@@ -53,8 +52,8 @@ class ChromeWebUIControllerFactory : public content::WebUIControllerFactory {
   // The returned favicon data must be
   // |gfx::kFaviconSize| x |gfx::kFaviconSize| DIP. GetFaviconForURL() should
   // be updated if this changes.
-  base::RefCountedMemory* GetFaviconResourceBytes(
-      const GURL& page_url, ui::ScaleFactor scale_factor) const;
+  base::RefCountedMemory* GetFaviconResourceBytes(const GURL& page_url,
+                                                  float favicon_scale) const;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeWebUIControllerFactory);
 };