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

webkit/tools/test_shell/test_shell_win.cc

Index: webkit/tools/test_shell/test_shell_win.cc
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index a5b1d8cf76cbd4739fa09004a64cf74cd28426d3..b07c26d532263bd83f34bb3a0449c25cff4ed22d 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -669,8 +669,13 @@ string16 TestShellWebKitInit::GetLocalizedString(int message_id) {
   return string16(localized, length);
 }
 
-// TODO(tc): Convert this to using resources from test_shell.rc.
 base::StringPiece TestShellWebKitInit::GetDataResource(int resource_id) {
+  return base::StringPiece();
+}
+
+// TODO(tc): Convert this to using resources from test_shell.rc.
+base::StringPiece TestShellWebKitInit::GetImageResource(int resource_id,
+                                                        float scale_factor) {
   switch (resource_id) {
   case IDR_BROKENIMAGE: {
     // Use webkit's broken image icon (16x16)
@@ -714,6 +719,7 @@ base::StringPiece TestShellWebKitInit::GetDataResource(int resource_id) {
   case IDR_INPUT_SPEECH:
   case IDR_INPUT_SPEECH_RECORDING:
   case IDR_INPUT_SPEECH_WAITING:
+    //TODO(flackr): Pass scale_factor.
     return TestShell::ResourceProvider(resource_id);
 
   default: