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

chrome/test/base/module_system_test.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 "chrome/test/base/module_system_test.h"
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "chrome/renderer/native_handler.h"
+#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #include <map>
 #include <string>
 
 // Native JS functions for doing asserts.
 class AssertNatives : public NativeHandler {
  public:
   AssertNatives()
       : assertion_made_(false),
@@ skipping 70 matching lines @@
 }
 
 void ModuleSystemTest::RegisterModule(const std::string& name,
                                       const std::string& code) {
   source_map_->RegisterModule(name, code);
 }
 
 void ModuleSystemTest::RegisterModule(const std::string& name,
                                       int resource_id) {
   const std::string& code = ResourceBundle::GetSharedInstance().
-      GetRawDataResource(resource_id).as_string();
+      GetRawDataResource(resource_id,
+                         ui::SCALE_FACTOR_NONE).as_string();
   source_map_->RegisterModule(name, code);
 }
 
 void ModuleSystemTest::OverrideNativeHandler(const std::string& name,
                                              const std::string& code) {
   RegisterModule(name, code);
   module_system_->OverrideNativeHandler(name);
 }
 
 void ModuleSystemTest::TearDown() {
   EXPECT_FALSE(try_catch_.HasCaught());
   // All tests must assert at least once unless otherwise specified.
   EXPECT_EQ(should_assertions_be_made_,
             assert_natives_->assertion_made());
   EXPECT_FALSE(assert_natives_->failed());
 }
 
 void ModuleSystemTest::ExpectNoAssertionsMade() {
   should_assertions_be_made_ = false;
 }
 
 v8::Handle<v8::Object> ModuleSystemTest::CreateGlobal(const std::string& name) {
   v8::HandleScope handle_scope;
   v8::Handle<v8::Object> object = v8::Object::New();
   v8::Context::GetCurrent()->Global()->Set(v8::String::New(name.c_str()),
                                            object);
   return handle_scope.Close(object);
 }