Revert 132517 - Metro/HiDPI: Move 1x icons into separate pak file

ui/base/resource/resource_bundle_mac.mm

Index: ui/base/resource/resource_bundle_mac.mm
===================================================================
--- ui/base/resource/resource_bundle_mac.mm	(revision 132528)
+++ ui/base/resource/resource_bundle_mac.mm	(working copy)
@@ -44,18 +44,8 @@
 
 void ResourceBundle::LoadCommonResources() {
   AddDataPack(GetResourcesPakFilePath(@"chrome", nil));
-  AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard", nil));
-  AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard", nil));
-
-  // On Windows and ChromeOS we load either the 1x resource or the 2x resource.
-  // On Mac we load both and let the UI framework decide which one to use.
-#if defined(ENABLE_HIDPI)
-  if (base::mac::IsOSLionOrLater()) {
+  if (base::mac::IsOSLionOrLater())
     AddDataPack(GetResourcesPakFilePath(@"theme_resources_2x", nil));
-    AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard_2x", nil));
-    AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard_2x", nil));
-  }
-#endif
 }
 
 // static