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

content/shell/shell_content_client.cc

Index: content/shell/shell_content_client.cc
diff --git a/content/shell/shell_content_client.cc b/content/shell/shell_content_client.cc
index e3c80d849cf85de50df9b5520977704d9c7327b0..c00459359f7fc59e165d885185dca3448d53c495 100644
--- a/content/shell/shell_content_client.cc
+++ b/content/shell/shell_content_client.cc
@@ -52,16 +52,11 @@ string16 ShellContentClient::GetLocalizedString(int message_id) const {
   return string16();
 }
 
-base::StringPiece ShellContentClient::GetDataResource(int resource_id) const {
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
-}
-
-base::StringPiece ShellContentClient::GetImageResource(
+base::StringPiece ShellContentClient::GetDataResource(
     int resource_id,
-    float scale_factor) const {
-  // TODO(flackr): Pass scale_factor to ResourceBundle to get best matching
-  // image resource for the given scale factor.
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
+    ui::ScaleFactor scale_factor) const {
+  return ResourceBundle::GetSharedInstance().GetRawDataResource(
+      resource_id, scale_factor);
 }
 
 #if defined(OS_WIN)