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

build/android/pylib/test_package.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 import logging
 import re
 import os
 import pexpect
 
@@ skipping 101 matching lines @@
           self.test_suite_dirname + '/chrome.pak',
           '/data/local/tmp/paks/chrome.pak')
       self.adb.PushIfNeeded(
           self.test_suite_dirname + '/locales/en-US.pak',
           '/data/local/tmp/paks/en-US.pak')
     if self.test_suite_basename == 'unit_tests':
       self.adb.PushIfNeeded(
           self.test_suite_dirname + '/resources.pak',
           '/data/local/tmp/paks/resources.pak')
       self.adb.PushIfNeeded(
-          self.test_suite_dirname + '/chrome_100_percent.pak',
-          '/data/local/tmp/paks/chrome_100_percent.pak')
+          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.adb.PushIfNeeded(self.test_suite_dirname + '/test_data',
                             '/data/local/tmp/test_data')
     if self.test_suite_basename == 'content_unittests':
       self.adb.PushIfNeeded(
           self.test_suite_dirname + '/content_resources.pak',
           '/data/local/tmp/paks/content_resources.pak')
 
   def _WatchTestOutput(self, p):
     """Watches the test output.
     Args:
@@ skipping 56 matching lines @@
       if ret_code:
         failed_tests += [BaseTestResult('gtest exit code: %d' % ret_code,
                                         'pexpect.before: %s'
                                         '\npexpect.after: %s'
                                         % (p.before,
                                            p.after))]
     # Create TestResults and return
     return TestResults.FromRun(ok=ok_tests, failed=failed_tests,
                                crashed=crashed_tests, timed_out=timed_out,
                                overall_fail=overall_fail)