Move android buildbot steps into buildbot dir

build/android/buildbot/bb_tests.py

Index: build/android/buildbot/bb_tests.py
diff --git a/build/android/buildbot/bb_tests.py b/build/android/buildbot/bb_tests.py
index c34bf54e4cf990f20921e76d55557217988535a4..3c12cd3b75deb72947e066c447f77478a377ea0e 100755
--- a/build/android/buildbot/bb_tests.py
+++ b/build/android/buildbot/bb_tests.py
@@ -82,21 +82,23 @@ def RunCmd(command, flunk_on_failure=True):
   return code
 
 
-def RunTestSuites(options, suite):
+def RunTestSuites(options, suites):
   """Manages an invocation of run_tests.py.
 
   Args:
     options: options object.
-    suite: The suite to pass to run_tests or None to run default suites.
+    suites: List of suites to run, or None to run default suites.
   """
   args = ['--verbose']
-  if suite:
-    args.extend(['-s', suite])
+
+  suites = suites or constants.DEFAULT_UNIT_TEST_SUITES
   if options.target == 'Release':
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
-  RunCmd(['build/android/run_tests.py'] + args)
+  for suite in suites:
+    buildbot_report.PrintNamedStep(suite)
+    RunCmd(['build/android/run_tests.py', '-s', suite] + args)
 
 
 def InstallApk(apk, apk_package, target):
@@ -180,20 +182,20 @@ def MainTestWrapper(options):
     for test in INSTRUMENTATION_TESTS.itervalues():
       RunInstrumentationSuite(options, test)
   if 'webkit' in options.test_filter:
-    RunTestSuites(options, 'webkit_unit_tests')
-    RunTestSuites(options, 'TestWebKitAPI')
+    RunTestSuites(options, ['webkit_unit_tests'])
+    RunTestSuites(options, ['TestWebKitAPI'])
     RunWebkitLint(options.target)
   if 'webkit_layout' in options.test_filter:
     RunWebkitLayoutTests(options)
 
   if options.experimental:
-    RunTestSuites(options, 'sandbox_linux_unittests')
+    RunTestSuites(options, ['sandbox_linux_unittests'])
 
   # Print logcat, kill logcat monitor
-  buildbot_report.PrintNamedStep('Logcat dump')
+  buildbot_report.PrintNamedStep('logcat_dump')
   RunCmd(['build/android/adb_logcat_printer.py', logcat_dir])
 
-  buildbot_report.PrintNamedStep('Test report')
+  buildbot_report.PrintNamedStep('test_report')
   for report in glob.glob(
       os.path.join(CHROME_SRC, 'out', options.target, 'test_logs', '*.log')):
     subprocess.Popen(['cat', report]).wait()