Revert of Run android tests through runtest.py.

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 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 collections
 import glob
 import hashlib
 import json
 import os
@@ skipping 78 matching lines @@
 
   Returns:
     The revision number.
   """
   revision = options.build_properties.get('got_revision')
   if not revision:
     revision = options.build_properties.get('revision', 'testing')
   return revision
 
 
-def _RunTest(options, cmd, suite):
-  """Run test command with runtest.py.
-
-  Args:
-    options: options object.
-    cmd: the command to run.
-    suite: test name.
-  """
-  property_args = bb_utils.EncodeProperties(options)
-  args = [os.path.join(SLAVE_SCRIPTS_DIR, 'runtest.py'),
-      '--test-type',
-      suite,
-      '--run-python-script'
-    ] + property_args
-  if options.factory_properties.get('generate_gtest_json'):
-    args.append('--generate-json-file')
-
-  if options.target == 'Release':
-    args += ['--target', 'Release']
-  args += cmd
-  RunCmd(args)
-
-
 def RunTestSuites(options, suites, suites_options=None):
   """Manages an invocation of test_runner.py for gtests.
 
   Args:
     options: options object.
     suites: List of suite names to run.
     suites_options: Command line options dictionary for particular suites.
                     For example,
                     {'content_browsertests', ['--num_retries=1', '--release']}
                     will add the options only to content_browsertests.
   """
 
   if not suites_options:
     suites_options = {}
 
   args = ['--verbose']
   if options.target == 'Release':
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
   if options.gtest_filter:
     args.append('--gtest-filter=%s' % options.gtest_filter)
 
   for suite in suites:
     bb_annotations.PrintNamedStep(suite)
     cmd = ['build/android/test_runner.py', 'gtest', '-s', suite] + args
     cmd += suites_options.get(suite, [])
     if suite == 'content_browsertests':
       cmd.append('--num_retries=1')
-    _RunTest(options, cmd, suite)
+    RunCmd(cmd)
 
 
 def RunChromeDriverTests(options):
   """Run all the steps for running chromedriver tests."""
   bb_annotations.PrintNamedStep('chromedriver_annotation')
   RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py',
           '--android-packages=%s,%s,%s,%s' %
           ('chrome_shell',
            'chrome_stable',
            'chrome_beta',
@@ skipping 550 matching lines @@
 
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))