Remove dependency on ui::ScaleFactor from ui/gfx

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 c74cb86460b0ca99dbeb16760d8756f691347cdc..d6b638dbab6c96aca032073264fea9aa9d5ca1d1 100644
--- a/chrome/browser/favicon/favicon_handler_unittest.cc
+++ b/chrome/browser/favicon/favicon_handler_unittest.cc
@@ -352,7 +352,8 @@ class FaviconHandlerTest : public ChromeRenderViewHostTestHarness {
     // results on all platforms.
     std::vector<ui::ScaleFactor> scale_factors;
     scale_factors.push_back(ui::SCALE_FACTOR_100P);
-    ui::test::SetSupportedScaleFactors(scale_factors);
+    scoped_set_supported_scale_factors_.reset(
+        new ui::test::ScopedSetSupportedScaleFactors(scale_factors));
 
     ChromeRenderViewHostTestHarness::SetUp();
   }
@@ -366,6 +367,9 @@ class FaviconHandlerTest : public ChromeRenderViewHostTestHarness {
   }
 
  private:
+  typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
+      ScopedSetSupportedScaleFactors;
+  ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
   DISALLOW_COPY_AND_ASSIGN(FaviconHandlerTest);
 };