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

webkit/support/platform_support_android.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/support/platform_support.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 44 matching lines @@
 void AfterShutdown() {
 }
 
 }  // namespace webkit_support
 
 string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
   return ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
 }
 
 base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {
+  return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
+}
+
+base::StringPiece TestWebKitPlatformSupport::GetImageResource(
+    int resource_id,
+    float scale_factor) {
   FilePath resources_path;
   PathService::Get(base::DIR_EXE, &resources_path);
   resources_path = resources_path.Append("DumpRenderTree_resources");
   switch (resource_id) {
     case IDR_BROKENIMAGE: {
       static std::string broken_image_data;
       if (broken_image_data.empty()) {
         FilePath path = resources_path.Append("missingImage.gif");
         bool success = file_util::ReadFileToString(path, &broken_image_data);
         if (!success)
           LOG(FATAL) << "Failed reading: " << path.value();
       }
       return broken_image_data;
     }
     case IDR_TEXTAREA_RESIZER: {
       static std::string resize_corner_data;
       if (resize_corner_data.empty()) {
         FilePath path = resources_path.Append("textAreaResizeCorner.png");
         bool success = file_util::ReadFileToString(path, &resize_corner_data);
         if (!success)
           LOG(FATAL) << "Failed reading: " << path.value();
       }
       return resize_corner_data;
     }
   }
 
+  // TODO(flackr): Pass scale_factor to ResourceBundle.
   return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
 }