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

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 194 matching lines @@
 
   window_list_ = new WindowList;
   layout_test_mode_ = layout_test_mode;
   allow_external_pages_ = allow_external_pages;
 
   web_prefs_ = new webkit_glue::WebPreferences;
 
   // mmap the data pack which holds strings used by WebCore. This is only
   // a fatal error if we're bundled, which means we might be running layout
   // tests. This is a harmless failure for test_shell_tests.
-  g_resource_data_pack = new ui::DataPack(ui::ResourceHandle::kScaleFactor100x);
+  g_resource_data_pack = new ui::DataPack(ui::SCALE_FACTOR_100P);
   NSString *resource_path =
       [base::mac::FrameworkBundle() pathForResource:@"test_shell"
                                              ofType:@"pak"];
   FilePath resources_pak_path([resource_path fileSystemRepresentation]);
   if (!g_resource_data_pack->Load(resources_pak_path)) {
     LOG(FATAL) << "failed to load test_shell.pak";
   }
 
   ResetWebPreferences();
 
@@ skipping 397 matching lines @@
                    res.length() / 2);
     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) {
+base::StringPiece TestShellWebKitInit::GetDataResource(
+    int resource_id,
+    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 = 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 49 matching lines @@
   return false;
 }
 
 void DidLoadPlugin(const std::string& filename) {
 }
 
 void DidUnloadPlugin(const std::string& filename) {
 }
 
 }  // namespace webkit_glue