Move android reboot step into python

build/android/buildbot/bb_run_bot.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 json
 import optparse
 import os
@@ skipping 37 matching lines @@
   if bot_config.bash_funs:
     bash_base = [
         '. build/android/buildbot/buildbot_functions.sh',
         "bb_baseline_setup %s '%s'" %
         (CHROME_SRC, "' '".join(property_args))]
     commands.append(Command(
         None, ['bash', '-exc', '; '.join(bash_base + bot_config.bash_funs)]))
 
   test_obj = bot_config.test_obj
   if test_obj:
-    run_test_cmd = ['build/android/buildbot/bb_tests.py'] + property_args
+    run_test_cmd = [
+        'build/android/buildbot/bb_device_steps.py', '--reboot'] + property_args
     for test in test_obj.tests:
       run_test_cmd.extend(['-f', test])
     if test_obj.extra_args:
       run_test_cmd.extend(test_obj.extra_args)
     commands.append(Command('Run tests', run_test_cmd))
 
   return commands
 
 
 def GetBotStepMap():
   compile_step = ['bb_compile']
   std_build_steps = ['bb_compile', 'bb_zip_build']
-  std_test_steps = ['bb_extract_build', 'bb_reboot_phones']
+  std_test_steps = ['bb_extract_build']
   std_tests = ['ui', 'unit']
 
   B = BotConfig
   def T(tests, extra_args=None):
     return TestConfig(tests, extra_args)
 
   bot_configs = [
       # Main builders
       B('main-builder-dbg',
         ['bb_compile', 'bb_run_findbugs', 'bb_zip_build'], None, None),
@@ skipping 103 matching lines @@
         continue
       env = dict(os.environ)
       env['BUILDBOT_TESTING'] = '1'
 
     return_code |= subprocess.call(command, cwd=CHROME_SRC, env=env)
   return return_code
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))