Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."

ui/compositor/test/compositor_test_support.cc

Index: ui/compositor/test/compositor_test_support.cc
diff --git a/ui/compositor/test/compositor_test_support.cc b/ui/compositor/test/compositor_test_support.cc
index 07c2ce708f2eb468a35200b803e11293f26e575f..0ac26095adb34a20d55a0c7e577f1345523e6d39 100644
--- a/ui/compositor/test/compositor_test_support.cc
+++ b/ui/compositor/test/compositor_test_support.cc
@@ -17,12 +17,9 @@ class CompositorTestPlatformSupport:
     return string16();
   }
 
-  virtual base::StringPiece GetDataResource(int resource_id) OVERRIDE {
-    return base::StringPiece();
-  }
-
-  virtual base::StringPiece GetImageResource(int resource_id,
-                                             float scale_factor) OVERRIDE {
+  virtual base::StringPiece GetDataResource(
+      int resource_id,
+      ui::ScaleFactor scale_factor) OVERRIDE {
     return base::StringPiece();
   }