Android gtest runner: Create only a single ApkHelper

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 sys
 import tempfile
 
@@ skipping 120 matching lines @@
 
   def __init__(self, args, isolate_delegate, error_func):
     super(GtestTestInstance, self).__init__()
     # TODO(jbudorick): Support multiple test suites.
     if len(args.suite_name) > 1:
       raise ValueError('Platform mode currently supports only 1 gtest suite')
     self._suite = args.suite_name[0]
 
     self._shard_timeout = args.shard_timeout
 
-    self._apk_path = os.path.join(
+    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
+    if not os.path.exists(apk_path):
+      self._apk_helper = None
     else:
-      helper = apk_helper.ApkHelper(self._apk_path)
-      self._activity = helper.GetActivityName()
-      self._package = helper.GetPackageName()
-      self._runner = helper.GetInstrumentationName()
-      self._permissions = helper.GetPermissions()
+      self._apk_helper = apk_helper.ApkHelper(apk_path)
       self._extras = {
-        _EXTRA_NATIVE_TEST_ACTIVITY: self._activity,
+          _EXTRA_NATIVE_TEST_ACTIVITY: self._apk_helper.GetActivityName(),
       }
       if self._suite in RUN_IN_SUB_THREAD_TEST_SUITES:
         self._extras[_EXTRA_RUN_IN_SUB_THREAD] = 1
       if self._suite in BROWSER_TEST_SUITES:
         self._extras[_EXTRA_SHARD_SIZE_LIMIT] = 1
         self._extras[EXTRA_SHARD_NANO_TIMEOUT] = int(1e9 * self._shard_timeout)
         self._shard_timeout = 900
 
     if not os.path.exists(self._exe_path):
       self._exe_path = None
-    if not self._apk_path and not self._exe_path:
+    if not 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
@@ skipping 131 matching lines @@
     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
+    return self._apk_helper and self._apk_helper.GetActivityName()
 
   @property
   def apk(self):
-    return self._apk_path
+    return self._apk_helper and self._apk_helper.path
+
+  @property
+  def apk_helper(self):
+    return self._apk_helper
 
   @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
+    return self._apk_helper and self._apk_helper.GetPackageName()
 
   @property
   def permissions(self):
-    return self._permissions
+    return self._apk_helper and self._apk_helper.GetPermissions()
 
   @property
   def runner(self):
-    return self._runner
+    return self._apk_helper and self._apk_helper.GetInstrumentationName()
 
   @property
   def shard_timeout(self):
     return self._shard_timeout
 
   @property
   def suite(self):
     return self._suite