Merged Android and non-Android code paths to reuse code in GTestTest

scripts/slave/recipe_modules/chromium_android/api.py

 # Copyright 2013 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 os
 import urllib
 
 from infra.libs.infra_types import freeze
 from slave import recipe_api
 
@@ skipping 609 matching lines @@
       args = args + ['--extra_src', extra_src]
     if path_to_config:
       args = args + ['--path_to_config', path_to_config]
     self.m.step('run bisect perf regression',
         [self.m.path['checkout'].join('tools',
                                       'run-bisect-perf-regression.py'),
          '-w', self.m.path['slave_build']] + args, **kwargs)
 
   def run_test_suite(self, suite, verbose=True, isolate_file_path=None,
                      gtest_filter=None, tool=None, flakiness_dashboard=None,
+                     name=None, json_results_file=None, args=None,
                      **kwargs):
-    args = []
+    args = args or []
     if verbose:
       args.append('--verbose')
     if self.c.BUILD_CONFIG == 'Release':
       args.append('--release')
     if isolate_file_path:
       args.append('--isolate_file_path=%s' % isolate_file_path)
     if gtest_filter:
       args.append('--gtest_filter=%s' % gtest_filter)
     if tool:
       args.append('--tool=%s' % tool)
     if flakiness_dashboard:
       args.append('--flakiness-dashboard-server=%s' %
           flakiness_dashboard)
+    if json_results_file:
+      args.extend(['--json-results-file', json_results_file])
 
     self.m.python(
-        str(suite),
+        name or str(suite),
         self.c.test_runner,
         ['gtest', '-s', suite] + args,
         env=self.m.chromium.get_env(),
         **kwargs)
 
   def run_java_unit_test_suite(self, suite, verbose=True, **kwargs):
     args = []
     if verbose:
       args.append('--verbose')
     if self.c.BUILD_CONFIG == 'Release':
@@ skipping 38 matching lines @@
 
     self.m.gsutil.upload(
         source=self.coverage_dir.join('coverage_html'),
         bucket='chrome-code-coverage',
         dest=gs_dest,
         args=['-R'],
         name='upload coverage report',
         link_name='Coverage report',
         version='4.7',
         **kwargs)