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

scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg.json

Index: scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg.json
diff --git a/scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg.json b/scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg.json
index cf39949ef9ba66e0753fdbfa42b951712326d7d1..edd37465cfd8b9dd97def98781c7fbbf9d7cc0c8 100644
--- a/scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg.json
+++ b/scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg.json
@@ -90,20 +90,42 @@
   },
   {
     "cmd": [
+      "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
+      "--known-devices-file",
+      "[HOME]/.android/known_devices.json",
+      "--adb-path",
+      "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+      "-v"
+    ],
+    "name": "device_recovery"
+  },
+  {
+    "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
+      "[SLAVE_BUILD]/src/build/android/provision_devices.py"
+    ],
+    "name": "provision_device"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_status.py",
       "--json-output",
       "/path/to/tmp/json",
-      "--restart-usb",
       "--known-devices-file",
-      "[BUILD]/site_config/.known_devices"
+      "[HOME]/.android/known_devices.json",
+      "--buildbot-path",
+      "/home/chrome-bot/.adb_device_info",
+      "-v",
+      "--overwrite-known-devices-files"
     ],
-    "name": "device_status_check",
+    "name": "device_status",
     "~followup_annotations": [
-      "@@@STEP_TEXT@Online devices: 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\", @@@",
@@ -117,13 +139,34 @@
       "@@@STEP_LOG_LINE@json.output@      \"temperature\": \"249\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"voltage\": \"4286\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"build\": \"LRX21O\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"blacklisted\": false, @@@",
       "@@@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@    \"ro.build.id\": \"LRX21O\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"ro.build.product\": \"flo\", @@@",
       "@@@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@  {@@@",
+      "@@@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_LINE@json.output@]@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
@@ -132,14 +175,6 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/provision_devices.py"
-    ],
-    "name": "provision_device"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
       "[SLAVE_BUILD]/src/mojo/tools/get_test_list.py",
       "{\"build_number\": 571, \"builder_name\": \"Mojo Android Builder Tests (dbg)\", \"dcheck_always_on\": false, \"is_debug\": true, \"master_name\": \"chromium.testing.master\", \"target_os\": \"android\", \"test_results_server\": \"test-results.appspot.com\", \"test_types\": [\"default\"]}",
       "/path/to/tmp/json"