Select theme resources from ResourceBundle at requested scale factor.

webkit/support/platform_support_android.cc

Index: webkit/support/platform_support_android.cc
diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc
index 79a9cd355c1fd83ddc8fa2f4abe958e89e647879..dd6c914cefb3e6fee300ac3b1a1a0867d47e1384 100644
--- a/webkit/support/platform_support_android.cc
+++ b/webkit/support/platform_support_android.cc
@@ -61,13 +61,9 @@ string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
   return ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
 }
 
-base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
-}
-
-base::StringPiece TestWebKitPlatformSupport::GetImageResource(
+base::StringPiece TestWebKitPlatformSupport::GetDataResource(
     int resource_id,
-    float scale_factor) {
+    ui::ScaleFactor scale_factor) {
   FilePath resources_path;
   PathService::Get(base::DIR_EXE, &resources_path);
   resources_path = resources_path.Append("DumpRenderTree_resources");
@@ -94,6 +90,6 @@ base::StringPiece TestWebKitPlatformSupport::GetImageResource(
     }
   }
 
-  // TODO(flackr): Pass scale_factor to ResourceBundle.
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
+  return ResourceBundle::GetSharedInstance().GetRawDataResource(
+      resource_id, scale_factor);
 }