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

ui/base/resource/resource_bundle_aurax11.cc

Index: ui/base/resource/resource_bundle_aurax11.cc
diff --git a/ui/base/resource/resource_bundle_aurax11.cc b/ui/base/resource/resource_bundle_aurax11.cc
index 862f2e8be0b12180e22bc7c83b9b62c0b7ccb519..f101530a0559b8d461897500d3393707f4ab65da 100644
--- a/ui/base/resource/resource_bundle_aurax11.cc
+++ b/ui/base/resource/resource_bundle_aurax11.cc
@@ -35,20 +35,20 @@ void ResourceBundle::LoadCommonResources() {
   // TODO(oshima): Fix this where it is unintended.
 
   AddDataPack(GetResourcesPakFilePath("chrome.pak"),
-              ResourceHandle::kScaleFactor100x);
+              SCALE_FACTOR_100P);
 
   if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
     AddDataPack(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
-                ResourceHandle::kScaleFactor100x);
+                SCALE_FACTOR_100P);
     AddDataPack(GetResourcesPakFilePath("ui_resources_touch.pak"),
-                ResourceHandle::kScaleFactor100x);
+                SCALE_FACTOR_100P);
   } else {
     AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
-                ResourceHandle::kScaleFactor100x);
+                SCALE_FACTOR_100P);
     AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
-                ResourceHandle::kScaleFactor100x);
+                SCALE_FACTOR_100P);
     AddDataPack(GetResourcesPakFilePath("ui_resources_2x.pak"),
-                ResourceHandle::kScaleFactor200x);
+                SCALE_FACTOR_200P);
   }
 }