Revert "[Android] Move to new device status and recovery scripts."

scripts/slave/recipe_modules/chromium_android/example.py

Index: scripts/slave/recipe_modules/chromium_android/example.py
diff --git a/scripts/slave/recipe_modules/chromium_android/example.py b/scripts/slave/recipe_modules/chromium_android/example.py
index e98ccb0e492c6a76863a2555460bf1ef249c8951..ff66f9a559c6478e1dc42c6708eb44983ed5e10d 100644
--- a/scripts/slave/recipe_modules/chromium_android/example.py
+++ b/scripts/slave/recipe_modules/chromium_android/example.py
@@ -154,10 +154,12 @@ def RunSteps(api, buildername):
 
   failure = False
   try:
-    # detect_and_setup_devices contains device recovery, provisiong, and status.
+    # TODO(luqui): remove redundant cruft, need one consistent API.
     api.chromium_android.detect_and_setup_devices()
-    api.chromium_android.device_status_check()
-    # Needed to test all flags to provision devices.
+
+    api.chromium_android.device_status_check(
+      restart_usb=config.get('restart_usb', False))
+
     api.chromium_android.provision_devices(
         skip_wipe=config.get('skip_wipe', False),
         disable_location=config.get('disable_location', False),
@@ -246,21 +248,13 @@ def GenTests(api):
   for buildername in BUILDERS:
     yield api.test('%s_basic' % buildername) + properties_for(buildername)
 
-  yield (api.test('tester_no_devices_during_recovery') +
-         properties_for('tester') +
-         api.step_data('device_recovery', retcode=1))
-
-  yield (api.test('tester_no_devices_during_status') +
-         properties_for('tester') +
-         api.step_data('device_status', retcode=1))
-
-  yield (api.test('tester_other_device_failure_during_recovery') +
+  yield (api.test('tester_no_devices') +
          properties_for('tester') +
-         api.step_data('device_recovery', retcode=2))
+         api.step_data('device_status_check', retcode=1))
 
-  yield (api.test('tester_other_device_failure_during_status') +
+  yield (api.test('tester_other_device_failure') +
          properties_for('tester') +
-         api.step_data('device_status', retcode=2))
+         api.step_data('device_status_check', retcode=2))
 
   yield (api.test('tester_with_step_warning') +
          properties_for('tester') +
@@ -273,7 +267,7 @@ def GenTests(api):
 
   yield (api.test('tester_offline_devices') +
          properties_for('tester') +
-         api.override_step_data('device_status',
+         api.override_step_data('device_status_check',
                                 api.json.output([{}, {}])))
 
   yield (api.test('perf_tests_failure') +