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

webkit/tools/test_shell/test_shell_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <fontconfig/fontconfig.h>
 #include <gtk/gtk.h>
@@ skipping 551 matching lines @@
   return ResourceBundle::GetSharedInstance().GetRawDataResource(key);
 }
 
 //-----------------------------------------------------------------------------
 
 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) {
   switch (resource_id) {
     case IDR_BROKENIMAGE:
       resource_id = IDR_BROKENIMAGE_TESTSHELL;
       break;
     case IDR_TEXTAREA_RESIZER:
       resource_id = IDR_TEXTAREA_RESIZER_TESTSHELL;
       break;
   }
+  // TODO(flackr): Pass scale_factor.
   return TestShell::ResourceProvider(resource_id);
 }