Android gtest runner: Only query device for test list when necessary (take 2)

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 tempfile
 
 from devil.android import apk_helper
@@ skipping 115 matching lines @@
   return ret
 
 
 class GtestTestInstance(test_instance.TestInstance):
 
   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._extract_test_list_from_filter = args.extract_test_list_from_filter
+    self._shard_timeout = args.shard_timeout
     self._suite = args.suite_name[0]
 
-    self._shard_timeout = args.shard_timeout
-
     incremental_part = '_incremental' if args.incremental_install else ''
     apk_path = os.path.join(
         constants.GetOutDirectory(), '%s_apk' % self._suite,
         '%s-debug%s.apk' % (self._suite, incremental_part))
     self._exe_path = os.path.join(constants.GetOutDirectory(),
                                   self._suite)
     if not os.path.exists(apk_path):
       self._apk_helper = None
     else:
       self._apk_helper = apk_helper.ApkHelper(apk_path)
@@ skipping 98 matching lines @@
     return self._shard_timeout
 
   @property
   def suite(self):
     return self._suite
 
   @property
   def test_arguments(self):
     return self._test_arguments
 
+  @property
+  def extract_test_list_from_filter(self):
+    return self._extract_test_list_from_filter
+
   #override
   def TestType(self):
     return 'gtest'
 
   #override
   def SetUp(self):
     """Map data dependencies via isolate."""
     if self._isolate_delegate:
       self._isolate_delegate.Remap(
           self._isolate_abs_path, self._isolated_abs_path)
@@ skipping 92 matching lines @@
         result_type = None
 
     return results
 
   #override
   def TearDown(self):
     """Clear the mappings created by SetUp."""
     if self._isolate_delegate:
       self._isolate_delegate.Clear()