Add scale factor and 2x resources from webkit and plumb through to ContentClient.

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 59f14099921c8a7024a6638700dbb84be1dc6497..9b7904bd82802513720daf49b92ca45945f66740 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -569,6 +569,11 @@ string16 TestShellWebKitInit::GetLocalizedString(int message_id) {
 }
 
 base::StringPiece TestShellWebKitInit::GetDataResource(int resource_id) {
+  return TestShell::ResourceProvider(resource_id);
+}
+
+base::StringPiece TestShellWebKitInit::GetImageResource(int resource_id,
+                                                        float scale_factor) {
   switch (resource_id) {
     case IDR_BROKENIMAGE:
       resource_id = IDR_BROKENIMAGE_TESTSHELL;
@@ -577,5 +582,6 @@ base::StringPiece TestShellWebKitInit::GetDataResource(int resource_id) {
       resource_id = IDR_TEXTAREA_RESIZER_TESTSHELL;
       break;
   }
+  // TODO(flackr): Pass scale_factor.
   return TestShell::ResourceProvider(resource_id);
 }