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

ui/base/resource/resource_bundle_win.cc

Index: ui/base/resource/resource_bundle_win.cc
===================================================================
--- ui/base/resource/resource_bundle_win.cc	(revision 150448)
+++ ui/base/resource/resource_bundle_win.cc	(working copy)
@@ -49,21 +49,30 @@
   switch (ui::GetDisplayLayout()) {
     case ui::LAYOUT_TOUCH:
       AddDataPackFromPath(
-          GetResourcesPakFilePath("chrome_touch_100_percent.pak"),
+          GetResourcesPakFilePath("theme_resources_touch_100_percent.pak"),
           SCALE_FACTOR_100P);
+      AddDataPackFromPath(
+          GetResourcesPakFilePath("ui_resources_100_percent.pak"),
+          SCALE_FACTOR_100P);
       break;
     default:
       if (use_hidpi) {
         AddDataPackFromPath(GetResourcesPakFilePath(
-                            "chrome_200_percent.pak"),
+                            "theme_resources_200_percent.pak"),
                             SCALE_FACTOR_200P);
         AddDataPackFromPath(GetResourcesPakFilePath(
+                            "ui_resources_200_percent.pak"),
+                            SCALE_FACTOR_200P);
+        AddDataPackFromPath(GetResourcesPakFilePath(
                             "webkit_resources_200_percent.pak"),
                             SCALE_FACTOR_200P);
       } else {
         AddDataPackFromPath(
-            GetResourcesPakFilePath("chrome_100_percent.pak"),
+            GetResourcesPakFilePath("theme_resources_100_percent.pak"),
             SCALE_FACTOR_100P);
+        AddDataPackFromPath(
+            GetResourcesPakFilePath("ui_resources_100_percent.pak"),
+            SCALE_FACTOR_100P);
       }
       break;
   }