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

BUG=139803
TEST=Chrome runs with ui and theme resources correctly loaded.

Review URL: https://chromiumcodereview.appspot.com/10825111

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150411 0039d316-1c4b-4281-b951-d872f2087c98


CrOS-Libchrome-Original-Commit: b3ff3b057cf8e0bcea5f5a9b838dcc2aa7378f1a
diff --git a/build/android/pylib/test_package.py b/build/android/pylib/test_package.py
index afba7bd..a6c7217 100644
--- a/build/android/pylib/test_package.py
+++ b/build/android/pylib/test_package.py
@@ -119,11 +119,8 @@
           self.test_suite_dirname + '/resources.pak',
           '/data/local/tmp/paks/resources.pak')
       self.adb.PushIfNeeded(
-          self.test_suite_dirname + '/theme_resources_100_percent.pak',
-          '/data/local/tmp/paks/theme_resources_100_percent.pak')
-      self.adb.PushIfNeeded(
-          self.test_suite_dirname + '/ui_resources_100_percent.pak',
-          '/data/local/tmp/paks/ui_resources_100_percent.pak')
+          self.test_suite_dirname + '/chrome_100_percent.pak',
+          '/data/local/tmp/paks/chrome_100_percent.pak')
       self.adb.PushIfNeeded(self.test_suite_dirname + '/test_data',
                             '/data/local/tmp/test_data')
     if self.test_suite_basename == 'content_unittests':