Select theme resources from ResourceBundle at requested scale factor.

webkit/tools/test_shell/test_shell_gtk.cc

Index: webkit/tools/test_shell/test_shell_gtk.cc
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index c99d070e7716a898b1dfc48b23b830267ad87951..941daec47d65824943d5efe52d4d9a296ee72f6c 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -23,9 +23,10 @@
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
 #include "ui/base/gtk/gtk_compat.h"
+#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/glue/webkit_glue.h"
@@ -559,7 +560,8 @@ void TestShell::ShowStartupDebuggingDialog() {
 
 // static
 base::StringPiece TestShell::ResourceProvider(int key) {
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(key);
+  return ResourceBundle::GetSharedInstance().GetRawDataResource(
+      key, ui::kScaleFactorNone);
 }
 
 //-----------------------------------------------------------------------------
@@ -568,12 +570,9 @@ string16 TestShellWebKitInit::GetLocalizedString(int message_id) {
   return ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
 }
 
-base::StringPiece TestShellWebKitInit::GetDataResource(int resource_id) {
-  return TestShell::ResourceProvider(resource_id);
-}
-
-base::StringPiece TestShellWebKitInit::GetImageResource(int resource_id,
-                                                        float scale_factor) {
+base::StringPiece TestShellWebKitInit::GetDataResource(
+    int resource_id,
+    ui::ScaleFactor scale_factor) {
   switch (resource_id) {
     case IDR_BROKENIMAGE:
       resource_id = IDR_BROKENIMAGE_TESTSHELL;