Revert 150411 - Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files.

ui/base/resource/resource_bundle_mac.mm

Index: ui/base/resource/resource_bundle_mac.mm
===================================================================
--- ui/base/resource/resource_bundle_mac.mm	(revision 150448)
+++ ui/base/resource/resource_bundle_mac.mm	(working copy)
@@ -51,8 +51,10 @@
 void ResourceBundle::LoadCommonResources() {
   AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil),
                       SCALE_FACTOR_100P);
-  AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent",
+  AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_100_percent",
                         nil), SCALE_FACTOR_100P);
+  AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_100_percent",
+                        nil), SCALE_FACTOR_100P);
   AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_100_percent",
                         nil), SCALE_FACTOR_100P);
 
@@ -60,8 +62,10 @@
   // On Mac we load both and let the UI framework decide which one to use.
 #if defined(ENABLE_HIDPI)
   if (base::mac::IsOSLionOrLater()) {
-    AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_200_percent",
+    AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_200_percent",
                           nil), SCALE_FACTOR_200P);
+    AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_200_percent",
+                          nil), SCALE_FACTOR_200P);
     AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_200_percent",
                           nil), SCALE_FACTOR_200P);
   }