Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."

webkit/support/platform_support_win.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/base_paths.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 54 matching lines @@
   wchar_t localized[MAX_LOADSTRING];
   int length = ::LoadString(::GetModuleHandle(NULL), message_id,
                             localized, MAX_LOADSTRING);
   if (!length && ::GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND) {
     NOTREACHED();
     return L"No string for this identifier!";
   }
   return string16(localized, length);
 }
 
-base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {
-  return ResourceProvider(resource_id);
-}
-
-base::StringPiece TestWebKitPlatformSupport::GetImageResource(
+base::StringPiece TestWebKitPlatformSupport::GetDataResource(
     int resource_id,
-    float scale_factor) {
+    ui::ScaleFactor 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 = GetResourceFilePath("missingImage.gif");
       bool success = file_util::ReadFileToString(path, &broken_image_data);
       if (!success) {
         LOG(FATAL) << "Failed reading: " << path.value();
       }
@@ skipping 10 matching lines @@
         LOG(FATAL) << "Failed reading: " << path.value();
       }
     }
     return resize_corner_data;
   }
   }
 
   // TODO(flackr): Pass scale_factor to ResourceProvider.
   return ResourceProvider(resource_id);
 }