Revert 194601 "Android: Enable content_browsertests by default."

trunk/src/build/android/buildbot/bb_device_steps.py

Index: trunk/src/build/android/buildbot/bb_device_steps.py
===================================================================
--- trunk/src/build/android/buildbot/bb_device_steps.py	(revision 198769)
+++ trunk/src/build/android/buildbot/bb_device_steps.py	(working copy)
@@ -146,7 +146,7 @@
   Args:
     options: options object.
   """
-  args = ['--verbose', '--num_retries=1']
+  args = ['--verbose']
   if options.target == 'Release':
     args.append('--release')
   if options.asan:
@@ -284,7 +284,6 @@
     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)
@@ -298,6 +297,7 @@
 
   if options.experimental:
     RunTestSuites(options, gtest_config.EXPERIMENTAL_TEST_SUITES)
+    RunBrowserTestSuite(options)
 
   # Print logcat, kill logcat monitor
   buildbot_report.PrintNamedStep('logcat_dump')