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

chrome/browser/ui/webui/chrome_web_ui_controller_factory.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_CONTROLLER_FACTORY_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_CONTROLLER_FACTORY_H_
 
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"
 #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;
 
 namespace base {
 class RefCountedMemory;
 }
 
 class ChromeWebUIControllerFactory : public content::WebUIControllerFactory {
  public:
   virtual content::WebUI::TypeID GetWebUIType(
       content::BrowserContext* browser_context,
       const GURL& url) const OVERRIDE;
   virtual bool UseWebUIForURL(content::BrowserContext* browser_context,
                               const GURL& url) const OVERRIDE;
   virtual bool UseWebUIBindingsForURL(content::BrowserContext* browser_context,
                                       const GURL& url) const OVERRIDE;
   virtual content::WebUIController* CreateWebUIControllerForURL(
       content::WebUI* web_ui,
       const GURL& url) const OVERRIDE;
 
   // Get the favicon for |page_url| and run |callback| with result when loaded.
   // Note. |callback| is always run asynchronously.
   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();
 
  protected:
   ChromeWebUIControllerFactory();
   virtual ~ChromeWebUIControllerFactory();
 
  private:
   friend struct DefaultSingletonTraits<ChromeWebUIControllerFactory>;
 
   // Gets the data for the favicon for a WebUI page. Returns NULL if the WebUI
   // does not have a favicon.
   // 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);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_CONTROLLER_FACTORY_H_