[Android] Reland splitting of device recovery and device status.

scripts/slave/recipe_modules/chromium_android/example.expected/tester_no_devices_during_recovery.json

Index: scripts/slave/recipe_modules/chromium_android/example.expected/tester_no_devices_during_recovery.json
diff --git a/scripts/slave/recipe_modules/chromium_android/example.expected/tester_no_devices.json b/scripts/slave/recipe_modules/chromium_android/example.expected/tester_no_devices_during_recovery.json
similarity index 81%
copy from scripts/slave/recipe_modules/chromium_android/example.expected/tester_no_devices.json
copy to scripts/slave/recipe_modules/chromium_android/example.expected/tester_no_devices_during_recovery.json
index b230a1d3e2d64139eea973dfe602ef40bd1717dc..dc153d6ec458440ebaaedee900a11caaf1013c19 100644
--- a/scripts/slave/recipe_modules/chromium_android/example.expected/tester_no_devices.json
+++ b/scripts/slave/recipe_modules/chromium_android/example.expected/tester_no_devices_during_recovery.json
@@ -270,69 +270,22 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
-      "--adb-path",
-      "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--json-output",
-      "/path/to/tmp/json",
       "--known-devices-file",
-      "[HOME]/.android/known_devices.json"
+      "[HOME]/.android/known_devices.json",
+      "--adb-path",
+      "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+      "-v"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "device_status_check",
+    "name": "device_recovery",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"adb_status\": \"device\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"battery\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"AC powered\": \"false\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"USB powered\": \"true\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"Wireless powered\": \"false\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"health\": \"2\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"level\": \"100\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"present\": \"true\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"scale\": \"100\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"status\": \"5\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"technology\": \"Li-ion\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"temperature\": \"249\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"voltage\": \"4286\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"blacklisted\": false, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"build\": \"LRX21O\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"build_detail\": \"google/razor/flo:5.0/LRX21O/1570415:userdebug/dev-keys\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"imei_slice\": \"Unknown\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"serial\": \"07a00ca4\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"type\": \"flo\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"usb_status\": true, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"wifi_ip\": \"\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"adb_status\": \"offline\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"blacklisted\": true, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"serial\": \"03e0363a003c6ad4\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"usb_status\": false@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"adb_status\": \"unauthorized\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"blacklisted\": true, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"serial\": \"03e0363a003c6ad5\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"usb_status\": true@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"adb_status\": \"device\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"blacklisted\": true, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"serial\": \"03e0363a003c6ad6\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"usb_status\": true@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LINK@report a bug@https://code.google.com/p/chromium/issues/entry?comment=Buildbot%3A+tester%0A%28Please+do+not+change+any+labels%29&labels=Restrict-View-Google%2COS-Android%2CInfra%2CInfra-Labs&summary=Device+Offline+on+chromium.testing.master+tehslave@@@",
       "@@@STEP_EXCEPTION@@@"
     ]
   },
@@ -475,7 +428,7 @@
   },
   {
     "name": "$result",
-    "reason": "Infra Failure: Step('device_status_check') returned 1",
+    "reason": "Infra Failure: Step('device_recovery') returned 1",
     "recipe_result": null,
     "status_code": 1
   }