Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

trunk/src/chrome/browser/favicon/favicon_handler_unittest.cc

Index: trunk/src/chrome/browser/favicon/favicon_handler_unittest.cc
===================================================================
--- trunk/src/chrome/browser/favicon/favicon_handler_unittest.cc	(revision 224497)
+++ trunk/src/chrome/browser/favicon/favicon_handler_unittest.cc	(working copy)
@@ -410,8 +410,7 @@
     // 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));
+    ui::test::SetSupportedScaleFactors(scale_factors);
 
     ChromeRenderViewHostTestHarness::SetUp();
   }
@@ -425,9 +424,6 @@
   }
 
  private:
-  typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
-      ScopedSetSupportedScaleFactors;
-  ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
   DISALLOW_COPY_AND_ASSIGN(FaviconHandlerTest);
 };