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

chrome/browser/favicon/favicon_handler_unittest.cc

Index: chrome/browser/favicon/favicon_handler_unittest.cc
diff --git a/chrome/browser/favicon/favicon_handler_unittest.cc b/chrome/browser/favicon/favicon_handler_unittest.cc
index 4aa61b0378efa96190578b1f7142dad43b54d6ba..e0783371974a5e95f0d2c1b7d28ac686c5aec6f7 100644
--- a/chrome/browser/favicon/favicon_handler_unittest.cc
+++ b/chrome/browser/favicon/favicon_handler_unittest.cc
@@ -453,10 +453,10 @@ class FaviconHandlerTest : public ChromeRenderViewHostTestHarness {
     // a downloaded bitmap in FaviconHandler::OnDidDownloadFavicon().
     // Force the values of the scale factors so that the tests produce the same
     // results on all platforms.
-    std::vector<ui::ScaleFactor> scale_factors;
-    scale_factors.push_back(ui::SCALE_FACTOR_100P);
-    scoped_set_supported_scale_factors_.reset(
-        new ui::test::ScopedSetSupportedScaleFactors(scale_factors));
+    std::vector<ui::ScaleFactor> favicon_scales;
+    favicon_scales.push_back(ui::SCALE_FACTOR_100P);
+    scoped_set_supported_favicon_scales_.reset(
+        new ui::test::ScopedSetSupportedScaleFactors(favicon_scales));
 
     ChromeRenderViewHostTestHarness::SetUp();
   }
@@ -472,7 +472,7 @@ class FaviconHandlerTest : public ChromeRenderViewHostTestHarness {
  private:
   typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
       ScopedSetSupportedScaleFactors;
-  ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
+  ScopedSetSupportedScaleFactors scoped_set_supported_favicon_scales_;
   DISALLOW_COPY_AND_ASSIGN(FaviconHandlerTest);
 };
 
@@ -1056,10 +1056,10 @@ TEST_F(FaviconHandlerTest, MultipleFavicons) {
 
   // Set the supported scale factors to 1x and 2x. This affects the behavior of
   // SelectFaviconFrames().
-  std::vector<ui::ScaleFactor> scale_factors;
-  scale_factors.push_back(ui::SCALE_FACTOR_100P);
-  scale_factors.push_back(ui::SCALE_FACTOR_200P);
-  ui::test::ScopedSetSupportedScaleFactors scoped_supported(scale_factors);
+  std::vector<ui::ScaleFactor> favicon_scales;
+  favicon_scales.push_back(ui::SCALE_FACTOR_100P);
+  favicon_scales.push_back(ui::SCALE_FACTOR_200P);
+  ui::test::ScopedSetSupportedScaleFactors scoped_supported(favicon_scales);
 
   // 1) Test that if there are several single resolution favicons to choose from
   // that the largest exact match is chosen.