Revert 194601 "Android: Enable content_browsertests by default."

trunk/src/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 128 matching lines @@
     if suite.is_suite_exe:
       cmd.append('--exe')
     RunCmd(cmd)
 
 def RunBrowserTestSuite(options):
   """Manages an invocation of run_browser_tests.py.
 
   Args:
     options: options object.
   """
-  args = ['--verbose', '--num_retries=1']
+  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 RunChromeDriverTests():
   """Run all the steps for running chromedriver tests."""
   buildbot_report.PrintNamedStep('chromedriver_annotation')
@@ skipping 117 matching lines @@
   RunCmd(['build/android/provision_devices.py', '-t', target])
 
   if options.install:
     test_obj = INSTRUMENTATION_TESTS[options.install]
     InstallApk(options, test_obj, print_step=True)
 
   if 'chromedriver' in options.test_filter:
     RunChromeDriverTests()
   if 'unit' in options.test_filter:
     RunTestSuites(options, gtest_config.STABLE_TEST_SUITES)
-    RunBrowserTestSuite(options)
   if 'ui' in options.test_filter:
     for test in INSTRUMENTATION_TESTS.itervalues():
       RunInstrumentationSuite(options, test)
   if 'webkit' in options.test_filter:
     RunTestSuites(options, [
         gtest_config.Apk('webkit_unit_tests'),
     ])
     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 56 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))