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

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

Index: scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Android__Nexus4_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Android__Nexus4_.json b/scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Android__Nexus4_.json
index 5935f2cd101b77d7765f4f2cb5a4128cc7f96f44..2b93707c45aed2be298da53d22a20ba050258027 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Android__Nexus4_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Android__Nexus4_.json
@@ -272,7 +272,7 @@
       "[BUILD]/scripts/slave/daemonizer.py",
       "--",
       "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[SLAVE_BUILD]/src/out/logcat_dir"
+      "[SLAVE_BUILD]/src/out/logcat"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
@@ -443,27 +443,6 @@
     "name": "spawn_device_monitor"
   },
   {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "blink_heap_unittests"
-  },
-  {
-    "cmd": [
-      "[BUILD]/scripts/slave/daemonizer.py",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[TMP_BASE]/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": "blink_heap_unittests.spawn_logcat_monitor",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
     "cmd": [
       "python",
       "-u",
@@ -483,47 +462,7 @@
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "blink_heap_unittests.blink_heap_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]/logcat_tmp_1"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "blink_heap_unittests.logcat_dump",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "webkit_unit_tests"
-  },
-  {
-    "cmd": [
-      "[BUILD]/scripts/slave/daemonizer.py",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[TMP_BASE]/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": "webkit_unit_tests.spawn_logcat_monitor",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "blink_heap_unittests"
   },
   {
     "cmd": [
@@ -545,26 +484,7 @@
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "webkit_unit_tests.webkit_unit_tests",
-    "~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]/logcat_tmp_2"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "webkit_unit_tests.logcat_dump",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "webkit_unit_tests"
   },
   {
     "cmd": [
@@ -655,7 +575,7 @@
       "[SLAVE_BUILD]/src/out/Release/full_log",
       "--",
       "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
-      "[SLAVE_BUILD]/src/out/logcat_dir"
+      "[SLAVE_BUILD]/src/out/logcat"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "logcat_dump"