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

chrome/browser/extensions/component_loader.cc

Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index cdc9c2e476fda4f73d1d696bd7a480056ac1fc7b..0414fe7bbbd3fc2d3847ecccf2fb46a2ca443245 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -24,6 +24,7 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/browser_resources.h"
+#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OFFICIAL_BUILD)
@@ -89,7 +90,8 @@ const Extension* ComponentLoader::Add(
     const FilePath& root_directory) {
   std::string manifest_contents =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          manifest_resource_id).as_string();
+          manifest_resource_id,
+          ui::SCALE_FACTOR_NONE).as_string();
   return Add(manifest_contents, root_directory);
 }
 
@@ -249,7 +251,8 @@ void ComponentLoader::AddOrReloadEnterpriseWebStore() {
   if (!enterprise_webstore_url.empty()) {
     std::string manifest_contents =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_ENTERPRISE_WEBSTORE_MANIFEST).as_string();
+          IDR_ENTERPRISE_WEBSTORE_MANIFEST,
+          ui::SCALE_FACTOR_NONE).as_string();
 
     // The manifest is missing some values that are provided by policy.
     DictionaryValue* manifest = ParseManifest(manifest_contents);