Select theme resources from ResourceBundle at requested scale factor.

chrome/browser/ui/webui/conflicts_ui.cc

Index: chrome/browser/ui/webui/conflicts_ui.cc
diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc
index 75c181604cc7e1657bd5f1e8864679a190de665d..8d6d7928faa9ecd95df5216cb975a9a4392e72c6 100644
--- a/chrome/browser/ui/webui/conflicts_ui.cc
+++ b/chrome/browser/ui/webui/conflicts_ui.cc
@@ -34,6 +34,7 @@
 #include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/base/resource/resource_handle.h"
 
 using content::UserMetricsAction;
 using content::WebContents;
@@ -174,7 +175,7 @@ ConflictsUI::ConflictsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
 base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() {
   return static_cast<base::RefCountedMemory*>(
       ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
-          IDR_CONFLICT_FAVICON));
+          IDR_CONFLICT_FAVICON, ui::ResourceHandle::kScaleFactorNone));
 }
 
 #endif