[Android] Make provision_devices.KillHostHeartbeat public again.

build/android/provision_devices.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.
 
 """Provisions Android devices with settings required for bots.
 
 Usage:
   ./provision_devices.py [-d <device serial number>]
@@ skipping 99 matching lines @@
   if options.skip_wipe:
     return
 
   device.EnableRoot()
   device_authorized = device.FileExists(constants.ADB_KEYS_FILE)
   if device_authorized:
     adb_keys = device.ReadFile(constants.ADB_KEYS_FILE,
                                as_root=True).splitlines()
   try:
     device.RunShellCommand(['wipe', 'data'],
-                           as_root=True, check_return=True, retries=0)
+                           as_root=True, check_return=True)
   except device_errors.CommandFailedError:
     logging.exception('Possible failure while wiping the device. '
                       'Attempting to continue.')
   device.adb.WaitForDevice()
 
   if device_authorized:
     adb_keys_set = set(adb_keys)
     for adb_key_file in options.adb_key_files or []:
       try:
         with open(adb_key_file, 'r') as f:
@@ skipping 115 matching lines @@
   device.PushChangedFiles([(adb_reboot, '/data/local/tmp/')])
   # Launch adb_reboot
   logging.info('  Launching adb_reboot ...')
   device.RunShellCommand(
       [device.GetDevicePieWrapper(), '/data/local/tmp/adb_reboot'],
       check_return=True)
 
 
 def _LaunchHostHeartbeat():
   # Kill if existing host_heartbeat
-  _KillHostHeartbeat()
+  KillHostHeartbeat()
   # Launch a new host_heartbeat
   logging.info('Spawning host heartbeat...')
   subprocess.Popen([os.path.join(constants.DIR_SOURCE_ROOT,
                                  'build/android/host_heartbeat.py')])
 
 
-def _KillHostHeartbeat():
+def KillHostHeartbeat():
   ps = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
   stdout, _ = ps.communicate()
   matches = re.findall('\\n.*host_heartbeat.*', stdout)
   for match in matches:
     logging.info('An instance of host heart beart running... will kill')
     pid = re.findall(r'(\S+)', match)[1]
     subprocess.call(['kill', str(pid)])
 
 
 def main():
@@ skipping 43 matching lines @@
   args = parser.parse_args()
   constants.SetBuildType(args.target)
 
   run_tests_helper.SetLogLevel(args.verbose)
 
   return ProvisionDevices(args)
 
 
 if __name__ == '__main__':
   sys.exit(main())