Select theme resources from ResourceBundle at requested scale factor.

webkit/support/platform_support_mac.mm

Index: webkit/support/platform_support_mac.mm
diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm
index f26ae69d3971f0de2fc8f6a43449c987890f6254..f7d4e3376e8601547b49e29ebe44a79ea7943183 100644
--- a/webkit/support/platform_support_mac.mm
+++ b/webkit/support/platform_support_mac.mm
@@ -103,7 +103,7 @@ void AfterInitialize(bool unit_test_mode) {
     return;  // We don't have a resource pack when running the unit-tests.
 
   // Load a data pack.
-  g_resource_data_pack = new ui::DataPack(ui::ResourceHandle::kScaleFactor100x);
+  g_resource_data_pack = new ui::DataPack(ui::SCALE_FACTOR_100P);
   NSString* resource_path =
       [base::mac::FrameworkBundle() pathForResource:@"DumpRenderTree"
                                              ofType:@"pak"];
@@ -216,16 +216,9 @@ static FilePath GetResourcesFilePath() {
   return path.AppendASCII("Resources");
 }
 
-base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {
-  base::StringPiece res;
-  if (g_resource_data_pack)
-    g_resource_data_pack->GetStringPiece(resource_id, &res);
-  return res;
-}
-
-base::StringPiece TestWebKitPlatformSupport::GetImageResource(
+base::StringPiece TestWebKitPlatformSupport::GetDataResource(
     int resource_id,
-    float scale_factor) {
+    ui::ScaleFactor scale_factor) {
   switch (resource_id) {
   case IDR_BROKENIMAGE: {
     // Use webkit's broken image icon (16x16)