Remove the android_isolate_path option from LocalGTestTest.

scripts/slave/recipe_modules/chromium_tests/steps.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 datetime
 import re
 import string
 
 
 class Test(object):
@@ skipping 209 matching lines @@
       return self._test_runs[suffix].json.output['valid']
     except Exception:  # pragma: no cover
       return False
 
   def failures(self, api, suffix):
     return self._test_runs[suffix].json.output['failures']
 
 
 class LocalGTestTest(Test):
   def __init__(self, name, args=None, target_name=None, use_isolate=False,
-               revision=None, webkit_revision=None, android_isolate_path=None,
+               revision=None, webkit_revision=None,
                android_shard_timeout=None, android_tool=None,
                override_compile_targets=None, override_isolate_target=None,
                use_xvfb=True, **runtest_kwargs):
     """Constructs an instance of LocalGTestTest.
 
     Args:
       name: Displayed name of the test. May be modified by suffixes.
       args: Arguments to be passed to the test.
       target_name: Actual name of the test. Defaults to name.
       use_isolate: When set, uses api.isolate.runtest to invoke the test.
@@ skipping 10 matching lines @@
       runtest_kwargs: Additional keyword args forwarded to the runtest.
 
     """
     super(LocalGTestTest, self).__init__()
     self._name = name
     self._args = args or []
     self._target_name = target_name
     self._use_isolate = use_isolate
     self._revision = revision
     self._webkit_revision = webkit_revision
-    self._android_isolate_path = android_isolate_path
     self._android_shard_timeout = android_shard_timeout
     self._android_tool = android_tool
     self._override_compile_targets = override_compile_targets
     self._override_isolate_target = override_isolate_target
     self._use_xvfb = use_xvfb
     self._runtest_kwargs = runtest_kwargs
 
   @property
   def name(self):
     return self._name
@@ skipping 41 matching lines @@
 
     gtest_results_file = api.test_utils.gtest_results(add_json_log=False)
     step_test_data = lambda: api.test_utils.test_api.canned_gtest_output(True)
 
     kwargs['name'] = self._step_name(suffix)
     kwargs['args'] = args
     kwargs['step_test_data'] = step_test_data
 
     if is_android:
       # TODO(sergiyb): Figure out if we can reuse isolate module for running
       # isolated Android tests, rather than using custom solution in Android

[Nico, 2016/08/09 16:32:51]

does this comment still makes sense? (i think so, but not sure)

[jbudorick, 2016/08/09 16:39:26]

I'm not sure. We're not even using isolate module in the non-android case, but
it'd still be nice to not have separate android paths in here.

+sergiyb: what was your original intention w/ this TODO?

[Sergiy Byelozyorov, 2016/08/09 16:56:40]

I think someone actually fixed it and did not remove this comment, see original
CL: https://codereview.chromium.org/892463002. There we were passing
isolate_file_path to the test laucnher. OTH, I am not 100% sure that this logic
wasn't just moved elsewhere. I'd search for the CL that removed
isolate_file_path to see whether the author removed it for good or actually just
moved it.

       # test launcher.
-      if self._android_isolate_path:
-        isolate_path = api.path['checkout'].join(self._android_isolate_path)
-        kwargs['isolate_file_path'] = isolate_path

[jbudorick, 2016/08/09 17:01:25]

sergiyb: ...are you referring to this?

[Sergiy Byelozyorov, 2016/08/09 18:22:49]

Ahem. Gotta look 10cm to the right (in a side-by-side diff) once in a while :-).
Yes, I mean this. I think this comment can now be removed.

[jbudorick, 2016/08/09 19:12:52]

Great, thanks. Removed the TODO.

       kwargs['json_results_file'] = gtest_results_file
       kwargs['flakiness_dashboard'] = 'test-results.appspot.com'
       kwargs['shard_timeout'] = self._android_shard_timeout
       kwargs['tool'] = self._android_tool
     else:
       kwargs['xvfb'] = self._use_xvfb
       kwargs['test_type'] = self.name
       kwargs['annotate'] = 'gtest'
       kwargs['test_launcher_summary_output'] = gtest_results_file
       kwargs.update(self._runtest_kwargs)
@@ skipping 1406 matching lines @@
           args=args)
       api.gsutil.upload(
           temp_output_dir.join(
               '%s-android-chrome.json' % timestamp_string),
           'chromium-annotated-tests', 'android')
 
 GOMA_TESTS = [
   GTestTest('base_unittests'),
   GTestTest('content_unittests'),
 ]