[Android] Add context manager to record logcat during step(s).

scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Remoting_Tests.json

Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Remoting_Tests.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Remoting_Tests.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Remoting_Tests.json
index 0d2e51f80f71fd3bf6a9a6db593298da3de7331a..91d5b4fc207c2011ed8bae533412bb50cfb8cf68 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Remoting_Tests.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Remoting_Tests.json
@@ -440,6 +440,27 @@
     "name": "spawn_device_monitor"
   },
   {
+    "cmd": [],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "remoting_unittests"
+  },
+  {
+    "cmd": [
+      "[BUILD]/scripts/slave/daemonizer.py",
+      "--",
+      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
+      "[TMP_BASE]/test_logcat_tmp_1"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "remoting_unittests.spawn_logcat_monitor",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
     "cmd": [
       "python",
       "-u",
@@ -459,7 +480,47 @@
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "remoting_unittests"
+    "name": "remoting_unittests.remoting_unittests",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[BUILD]/scripts/slave/tee.py",
+      "/path/to/tmp/logcat",
+      "--",
+      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
+      "[TMP_BASE]/test_logcat_tmp_1"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "remoting_unittests.logcat_dump",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "ChromotingTest"
+  },
+  {
+    "cmd": [
+      "[BUILD]/scripts/slave/daemonizer.py",
+      "--",
+      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
+      "[TMP_BASE]/test_logcat_tmp_2"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "ChromotingTest.spawn_logcat_monitor",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
@@ -474,7 +535,10 @@
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "install Chromoting.apk"
+    "name": "ChromotingTest.install Chromoting.apk",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
@@ -496,9 +560,25 @@
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
-    "name": "Instrumentation test ChromotingTest",
+    "name": "ChromotingTest.Instrumentation test ChromotingTest",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[BUILD]/scripts/slave/tee.py",
+      "/path/to/tmp/logcat",
+      "--",
+      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
+      "[TMP_BASE]/test_logcat_tmp_2"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "ChromotingTest.logcat_dump",
     "~followup_annotations": [
-      "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {