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

chrome/browser/ui/webui/favicon_source.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_FAVICON_SOURCE_H_
 #define CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_
 
 #include <map>
 #include <string>
 
@@ skipping 70 matching lines @@
   virtual bool ShouldReplaceExistingSource() const OVERRIDE;
   virtual bool ShouldServiceRequest(
       const net::URLRequest* request) const OVERRIDE;
 
  protected:
   struct IconRequest {
     IconRequest();
     IconRequest(const content::URLDataSource::GotDataCallback& cb,
                 const GURL& path,
                 int size,
-                ui::ScaleFactor scale);
+                float scale);
     ~IconRequest();
 
     content::URLDataSource::GotDataCallback callback;
     GURL request_path;
     int size_in_dip;
-    ui::ScaleFactor scale_factor;
+    float device_scale_factor;
   };
 
   // Called when the favicon data is missing to perform additional checks to
   // locate the resource.
   // |request| contains information for the failed request.
   // Returns true if the missing resource is found.
   virtual bool HandleMissingResource(const IconRequest& request);
 
   Profile* profile_;
 
@@ skipping 27 matching lines @@
   // database doesn't have a favicon for a webpage. Indexed by IconSize values.
   scoped_refptr<base::RefCountedMemory> default_favicons_[NUM_SIZES];
 
   // The favicon_base::IconTypes of icon that this FaviconSource handles.
   int icon_types_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconSource);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_