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

chrome/test/base/module_system_test.cc

Index: chrome/test/base/module_system_test.cc
diff --git a/chrome/test/base/module_system_test.cc b/chrome/test/base/module_system_test.cc
index ce6ac54a3e8cb4433a4767e4a7434450e159e75e..d6b5de299d646929eec9067cad01f274742883f5 100644
--- a/chrome/test/base/module_system_test.cc
+++ b/chrome/test/base/module_system_test.cc
@@ -8,6 +8,7 @@
 #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>
@@ -98,7 +99,8 @@ void ModuleSystemTest::RegisterModule(const std::string& name,
 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);
 }