Android: Run content_browsertests on the experimental bot

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 json
 import multiprocessing
 import optparse
@@ skipping 119 matching lines @@
   """
   args = ['--verbose']
   if options.target == 'Release':
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
   for suite in suites:
     buildbot_report.PrintNamedStep(suite)
     RunCmd(['build/android/run_tests.py', '-s', suite] + args)
 
+def RunBrowserTestSuite(options):
+  """Manages an invocation of run_browser_tests.py.
+
+  Args:
+    options: options object.
+  """
+  args = ['--verbose']
+  if options.target == 'Release':
+    args.append('--release')
+  if options.asan:
+    args.append('--tool=asan')
+  buildbot_report.PrintNamedStep(constants.BROWSERTEST_SUITE_NAME)
+  RunCmd(['build/android/run_browser_tests.py'] + args)
 
 def InstallApk(options, test, print_step=False):
   """Install an apk to all phones.
 
   Args:
     options: options object
     test: An I_TEST namedtuple
     print_step: Print a buildbot step
   """
   if print_step:
@@ skipping 101 matching lines @@
     for test in INSTRUMENTATION_TESTS.itervalues():
       RunInstrumentationSuite(options, test)
   if 'webkit' in options.test_filter:
     RunTestSuites(options, ['webkit_unit_tests', 'TestWebKitAPI'])
     RunWebkitLint(options.target)
   if 'webkit_layout' in options.test_filter:
     RunWebkitLayoutTests(options)
 
   if options.experimental:
     RunTestSuites(options, gtest_config.EXPERIMENTAL_TEST_SUITES)
+    RunBrowserTestSuite(options)
 
   # Print logcat, kill logcat monitor
   buildbot_report.PrintNamedStep('logcat_dump')
   RunCmd(['build/android/adb_logcat_printer.py', logcat_dir])
 
   buildbot_report.PrintNamedStep('test_report')
   for report in glob.glob(
       os.path.join(CHROME_SRC, 'out', options.target, 'test_logs', '*.log')):
     RunCmd(['cat', report])
     os.remove(report)
@@ skipping 53 matching lines @@
       'slave', 'android'))
   if os.path.exists(build_internal_android):
     android_paths.insert(0, build_internal_android)
   os.environ['PATH'] = os.pathsep.join(android_paths + [os.environ['PATH']])
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))