Revert of [Android] Refactor browser test execution.

build/android/pylib/gtest/gtest_test_instance.py

 # Copyright 2014 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
 import shutil
 import sys
 import tempfile
 
 from pylib import constants
 from pylib.base import base_test_result
 from pylib.base import test_instance
-from pylib.utils import apk_helper
 
 sys.path.append(os.path.join(
     constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib', 'common'))
 import unittest_util
 
 
 BROWSER_TEST_SUITES = [
   'components_browsertests',
   'content_browsertests',
 ]
 
 
-_DEFAULT_ISOLATE_FILE_PATHS = {
-    'base_unittests': 'base/base_unittests.isolate',
-    'blink_heap_unittests':
-      'third_party/WebKit/Source/platform/heap/BlinkHeapUnitTests.isolate',
-    'breakpad_unittests': 'breakpad/breakpad_unittests.isolate',
-    'cc_perftests': 'cc/cc_perftests.isolate',
-    'components_browsertests': 'components/components_browsertests.isolate',
-    'components_unittests': 'components/components_unittests.isolate',
-    'content_browsertests': 'content/content_browsertests.isolate',
-    'content_unittests': 'content/content_unittests.isolate',
-    'media_perftests': 'media/media_perftests.isolate',
-    'media_unittests': 'media/media_unittests.isolate',
-    'midi_unittests': 'media/midi/midi_unittests.isolate',
-    'net_unittests': 'net/net_unittests.isolate',
-    'sql_unittests': 'sql/sql_unittests.isolate',
-    'sync_unit_tests': 'sync/sync_unit_tests.isolate',
-    'ui_base_unittests': 'ui/base/ui_base_tests.isolate',
-    'unit_tests': 'chrome/unit_tests.isolate',
-    'webkit_unit_tests':
-      'third_party/WebKit/Source/web/WebKitUnitTests.isolate',
-}
-
-
 # Used for filtering large data deps at a finer grain than what's allowed in
 # isolate files since pushing deps to devices is expensive.
 # Wildcards are allowed.
 _DEPS_EXCLUSION_LIST = [
     'chrome/test/data/extensions/api_test',
     'chrome/test/data/extensions/secure_shell',
     'chrome/test/data/firefox*',
     'chrome/test/data/gpu',
     'chrome/test/data/image_decoding',
     'chrome/test/data/import',
     'chrome/test/data/page_cycler',
     'chrome/test/data/perf',
     'chrome/test/data/pyauto_private',
     'chrome/test/data/safari_import',
     'chrome/test/data/scroll',
     'chrome/test/data/third_party',
     'third_party/hunspell_dictionaries/*.dic',
     # crbug.com/258690
     'webkit/data/bmp_decoder',
     'webkit/data/ico_decoder',
 ]
 
 
-_EXTRA_NATIVE_TEST_ACTIVITY = (
-    'org.chromium.native_test.NativeTestInstrumentationTestRunner.'
-        'NativeTestActivity')
-_EXTRA_SHARD_SIZE_LIMIT =(
-    'org.chromium.native_test.NativeTestInstrumentationTestRunner.'
-        'ShardSizeLimit')
-
 # TODO(jbudorick): Remove these once we're no longer parsing stdout to generate
 # results.
 _RE_TEST_STATUS = re.compile(
     r'\[ +((?:RUN)|(?:FAILED)|(?:OK)) +\] ?([^ ]+)(?: \((\d+) ms\))?$')
 _RE_TEST_RUN_STATUS = re.compile(
     r'\[ +(PASSED|RUNNER_FAILED|CRASHED) \] ?[^ ]+')
 
 
 # TODO(jbudorick): Make this a class method of GtestTestInstance once
 # test_package_apk and test_package_exe are gone.
@@ skipping 39 matching lines @@
       raise ValueError('Platform mode currently supports only 1 gtest suite')
     self._suite = args.suite_name[0]
 
     self._apk_path = os.path.join(
         constants.GetOutDirectory(), '%s_apk' % self._suite,
         '%s-debug.apk' % self._suite)
     self._exe_path = os.path.join(constants.GetOutDirectory(),
                                   self._suite)
     if not os.path.exists(self._apk_path):
       self._apk_path = None
-      self._activity = None
-      self._package = None
-      self._runner = None
-    else:
-      helper = apk_helper.ApkHelper(self._apk_path)
-      self._activity = helper.GetActivityName()
-      self._package = helper.GetPackageName()
-      self._runner = helper.GetInstrumentationName()
-      self._extras = {
-        _EXTRA_NATIVE_TEST_ACTIVITY: self._activity,
-      }
-      if self._suite in BROWSER_TEST_SUITES:
-        self._extras[_EXTRA_SHARD_SIZE_LIMIT] = 1
-
     if not os.path.exists(self._exe_path):
       self._exe_path = None
     if not self._apk_path and not self._exe_path:
       error_func('Could not find apk or executable for %s' % self._suite)
 
     self._data_deps = []
     if args.test_filter:
       self._gtest_filter = args.test_filter
     elif args.test_filter_file:
       with open(args.test_filter_file, 'r') as f:
         self._gtest_filter = ':'.join(l.strip() for l in f)
     else:
       self._gtest_filter = None
-
-    if not args.isolate_file_path:
-      default_isolate_file_path = _DEFAULT_ISOLATE_FILE_PATHS.get(self._suite)
-      if default_isolate_file_path:
-        args.isolate_file_path = os.path.join(
-            constants.DIR_SOURCE_ROOT, default_isolate_file_path)
-
     if args.isolate_file_path:
       self._isolate_abs_path = os.path.abspath(args.isolate_file_path)
       self._isolate_delegate = isolate_delegate
       self._isolated_abs_path = os.path.join(
           constants.GetOutDirectory(), '%s.isolated' % self._suite)
     else:
       logging.warning('No isolate file provided. No data deps will be pushed.');
       self._isolate_delegate = None
 
     if args.app_data_files:
@@ skipping 101 matching lines @@
       logging.info(l)
     return results
 
   #override
   def TearDown(self):
     """Clear the mappings created by SetUp."""
     if self._isolate_delegate:
       self._isolate_delegate.Clear()
 
   @property
-  def activity(self):
-    return self._activity
-
-  @property
   def apk(self):
     return self._apk_path
 
   @property
   def app_file_dir(self):
     return self._app_data_file_dir
 
   @property
   def app_files(self):
     return self._app_data_files
 
   @property
   def exe(self):
     return self._exe_path
 
   @property
-  def extras(self):
-    return self._extras
-
-  @property
-  def package(self):
-    return self._package
-
-  @property
-  def runner(self):
-    return self._runner
-
-  @property
   def suite(self):
     return self._suite