[Android] Use isolate remap instead of check.

build/android/pylib/gtest/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 os
 import re
 
 from pylib import constants
@@ skipping 71 matching lines @@
         continue
       if 'YOU HAVE' in test:
         break
       test_name = test[2:]
       if not any([test_name.startswith(x) for x in disabled_prefixes]):
         ret += [current + test_name]
     return ret
 
   def PushDataAndPakFiles(self):
     external_storage = self.adb.GetExternalStorage()
-    if (self.test_suite_basename == 'ui_unittests' or
-        self.test_suite_basename == 'unit_tests'):
+    if (self.test_suite_basename == 'ui_unittests'):
       self.adb.PushIfNeeded(
           self.test_suite_dirname + '/chrome.pak',
           external_storage + '/paks/chrome.pak')
       self.adb.PushIfNeeded(
           self.test_suite_dirname + '/locales/en-US.pak',
           external_storage + '/paks/en-US.pak')
-    if self.test_suite_basename == 'unit_tests':
-      self.adb.PushIfNeeded(
-          self.test_suite_dirname + '/resources.pak',
-          external_storage + '/paks/resources.pak')
-      self.adb.PushIfNeeded(
-          self.test_suite_dirname + '/chrome_100_percent.pak',
-          external_storage + '/paks/chrome_100_percent.pak')
-      self.adb.PushIfNeeded(self.test_suite_dirname + '/test_data',
-                            external_storage + '/test_data')
     if self.test_suite_basename in ('content_unittests',
                                     'components_unittests'):
       self.adb.PushIfNeeded(
           self.test_suite_dirname + '/content_resources.pak',
           external_storage + '/paks/content_resources.pak')
     if self.test_suite_basename == 'breakpad_unittests':
       self.adb.PushIfNeeded(
           self.test_suite_dirname + '/linux_dumper_unittest_helper',
           constants.TEST_EXECUTABLE_DIR + '/linux_dumper_unittest_helper')
     if self.test_suite_basename == 'content_browsertests':
@@ skipping 73 matching lines @@
     finally:
       p.close()
 
     ret_code = self._GetGTestReturnCode()
     if ret_code:
       logging.critical(
           'gtest exit code: %d\npexpect.before: %s\npexpect.after: %s',
           ret_code, p.before, p.after)
 
     return results