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

webkit/tools/test_shell/test_shell_mac.mm

 // 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 <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 #import <objc/objc-runtime.h>
 #include <sys/stat.h>
 
 #include "webkit/tools/test_shell/test_shell.h"
@@ skipping 613 matching lines @@
     break;
   case ui::DataPack::BINARY:
     NOTREACHED();
     break;
   }
 
   return msg;
 }
 
 base::StringPiece TestShellWebKitInit::GetDataResource(int resource_id) {
+  return base::StringPiece();
+}
+
+base::StringPiece TestShellWebKitInit::GetImageResource(int resource_id,
+                                                        float scale_factor) {
   switch (resource_id) {
   case IDR_BROKENIMAGE: {
     // Use webkit's broken image icon (16x16)
     static std::string broken_image_data;
     if (broken_image_data.empty()) {
       FilePath path = GetResourcesFilePath();
       // In order to match WebKit's colors for the missing image, we have to
       // use a PNG. The GIF doesn't have the color range needed to correctly
       // match the TIFF they use in Safari.
       path = path.AppendASCII("missingImage.png");
@@ skipping 26 matching lines @@
   case IDR_MEDIA_PLAY_BUTTON:
   case IDR_MEDIA_PLAY_BUTTON_DISABLED:
   case IDR_MEDIA_SOUND_FULL_BUTTON:
   case IDR_MEDIA_SOUND_NONE_BUTTON:
   case IDR_MEDIA_SOUND_DISABLED:
   case IDR_MEDIA_SLIDER_THUMB:
   case IDR_MEDIA_VOLUME_SLIDER_THUMB:
   case IDR_INPUT_SPEECH:
   case IDR_INPUT_SPEECH_RECORDING:
   case IDR_INPUT_SPEECH_WAITING:
+    // TODO(flackr): Pass scale_factor to ResourceProvider.
     return TestShell::ResourceProvider(resource_id);
 
   default:
     break;
   }
 
   return base::StringPiece();
 }
 
 namespace webkit_glue {
 
 bool DownloadUrl(const std::string& url, NSWindow* caller_window) {
   return false;
 }
 
 void DidLoadPlugin(const std::string& filename) {
 }
 
 void DidUnloadPlugin(const std::string& filename) {
 }
 
 }  // namespace webkit_glue