Select theme resources from ResourceBundle at requested scale factor.

content/test/test_content_client.cc

Index: content/test/test_content_client.cc
diff --git a/content/test/test_content_client.cc b/content/test/test_content_client.cc
index 11d9bb6e07390197fa81bc4e72da07cf36fda924..0d2e3e031d4e75576aff149005e0c66099dee7bc 100644
--- a/content/test/test_content_client.cc
+++ b/content/test/test_content_client.cc
@@ -11,7 +11,7 @@
 #include "base/string_piece.h"
 
 TestContentClient::TestContentClient()
-    : data_pack_(ui::ResourceHandle::kScaleFactor100x) {
+    : data_pack_(ui::SCALE_FACTOR_100P) {
   FilePath content_resources_pack_path;
   PathService::Get(base::DIR_MODULE, &content_resources_pack_path);
   content_resources_pack_path = content_resources_pack_path.Append(
@@ -58,15 +58,9 @@ string16 TestContentClient::GetLocalizedString(int message_id) const {
   return string16();
 }
 
-base::StringPiece TestContentClient::GetDataResource(int resource_id) const {
-  base::StringPiece resource;
-  data_pack_.GetStringPiece(resource_id, &resource);
-  return resource;
-}
-
-base::StringPiece TestContentClient::GetImageResource(
+base::StringPiece TestContentClient::GetDataResource(
     int resource_id,
-    float scale_factor) const {
+    ui::ScaleFactor scale_factor) const {
   base::StringPiece resource;
   data_pack_.GetStringPiece(resource_id, &resource);
   return resource;