Revert "Switch remaining bots to new Telemetry GPU isolate."

scripts/slave/recipes/chromium_trybot.expected/swarming_test_failure.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "[BUILD]/scripts/slave/bot_update.py",
       "--master",
       "tryserver.chromium.linux",
       "--builder",
       "linux_chromium_rel_ng",
@@ skipping 242 matching lines @@
     "name": "analyze",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",
       "@@@STEP_LOG_END@excluded_files@@@",
       "@@@STEP_LOG_LINE@analyze_details@{@@@",
       "@@@STEP_LOG_LINE@analyze_details@  \"additional_compile_targets\": [@@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chromium_swarm_tests\"@@@",
       "@@@STEP_LOG_LINE@analyze_details@  ], @@@",
       "@@@STEP_LOG_LINE@analyze_details@  \"compile_targets\": [@@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"angle_unittests_run\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"chrome\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chromium_swarm_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_unittests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"tab_capture_end2end_tests_run\", @@@",
-      "@@@STEP_LOG_LINE@analyze_details@    \"telemetry_gpu_new_test_run\"@@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"telemetry_gpu_test_run\"@@@",
       "@@@STEP_LOG_LINE@analyze_details@  ], @@@",
       "@@@STEP_LOG_LINE@analyze_details@  \"self.m.filter.compile_targets\": [@@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"angle_unittests_run\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"chrome\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chromium_swarm_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_unittests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"tab_capture_end2end_tests_run\", @@@",
-      "@@@STEP_LOG_LINE@analyze_details@    \"telemetry_gpu_new_test_run\"@@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"telemetry_gpu_test_run\"@@@",
       "@@@STEP_LOG_LINE@analyze_details@  ], @@@",
       "@@@STEP_LOG_LINE@analyze_details@  \"self.m.filter.test_targets\": [@@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"angle_unittests_run\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"chrome\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_unittests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"tab_capture_end2end_tests_run\", @@@",
-      "@@@STEP_LOG_LINE@analyze_details@    \"telemetry_gpu_new_test_run\"@@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"telemetry_gpu_test_run\"@@@",
       "@@@STEP_LOG_LINE@analyze_details@  ], @@@",
       "@@@STEP_LOG_LINE@analyze_details@  \"test_targets\": [@@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"angle_unittests_run\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"chrome\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_unittests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"tab_capture_end2end_tests_run\", @@@",
-      "@@@STEP_LOG_LINE@analyze_details@    \"telemetry_gpu_new_test_run\"@@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"telemetry_gpu_test_run\"@@@",
       "@@@STEP_LOG_LINE@analyze_details@  ]@@@",
       "@@@STEP_LOG_LINE@analyze_details@}@@@",
       "@@@STEP_LOG_END@analyze_details@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILD]/scripts/slave/cleanup_temp.py"
@@ skipping 21 matching lines @@
       "gen",
       "-m",
       "tryserver.chromium.linux",
       "-b",
       "linux_chromium_rel_ng",
       "--config-file",
       "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
       "--goma-dir",
       "[BUILD]/goma",
       "--swarming-targets-file",
-      "gl_tests\ncontent_gl_tests\ngl_tests\nangle_unittests\ngl_unittests\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntab_capture_end2end_tests\ngl_tests\n",
+      "gl_tests\ncontent_gl_tests\ngl_tests\nangle_unittests\ngl_unittests\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntab_capture_end2end_tests\ngl_tests\n",
       "//out/Release"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "generate_build_files (with patch)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILD]/scripts/slave/compile.py",
       "--target",
       "Release",
       "--src-dir",
       "[SLAVE_BUILD]/src",
       "--build-tool",
       "ninja",
       "--compiler",
       "goma",
       "--goma-jsonstatus",
       "/path/to/tmp/json",
       "--goma-dir",
       "[BUILD]/goma",
       "--goma-fail-fast",
       "--goma-disable-local-fallback",
       "--ninja-ensure-up-to-date",
       "--",
       "angle_unittests_run",
+      "chrome",
       "chromium_swarm_tests",
       "content_gl_tests_run",
       "gl_tests",
       "gl_tests_run",
       "gl_unittests_run",
       "tab_capture_end2end_tests_run",
-      "telemetry_gpu_new_test_run"
+      "telemetry_gpu_test_run"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "compile (with patch)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
       "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
@@ skipping 14 matching lines @@
       "-u",
       "RECIPE_MODULE[isolate]/resources/isolate.py",
       "[SLAVE_BUILD]/src/tools/swarming_client",
       "batcharchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "--verbose",
       "[SLAVE_BUILD]/src/out/Release/content_gl_tests.isolated.gen.json",
-      "[SLAVE_BUILD]/src/out/Release/telemetry_gpu_new_test.isolated.gen.json",
       "[SLAVE_BUILD]/src/out/Release/gl_unittests.isolated.gen.json",
       "[SLAVE_BUILD]/src/out/Release/tab_capture_end2end_tests.isolated.gen.json",
       "[SLAVE_BUILD]/src/out/Release/gl_tests.isolated.gen.json",
-      "[SLAVE_BUILD]/src/out/Release/angle_unittests.isolated.gen.json"
+      "[SLAVE_BUILD]/src/out/Release/angle_unittests.isolated.gen.json",
+      "[SLAVE_BUILD]/src/out/Release/telemetry_gpu_test.isolated.gen.json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "isolate tests",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"angle_unittests\": \"[dummy hash for angle_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"content_gl_tests\": \"[dummy hash for content_gl_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"gl_tests\": \"[dummy hash for gl_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"gl_unittests\": \"[dummy hash for gl_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tab_capture_end2end_tests\": \"[dummy hash for tab_capture_end2end_tests]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"telemetry_gpu_new_test\": \"[dummy hash for telemetry_gpu_new_test]\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"telemetry_gpu_test\": \"[dummy hash for telemetry_gpu_test]\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "trigger",
@@ skipping 457 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:maps_pixel_test on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:maps_pixel_test on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "maps",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--build-revision",
       "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--test-machine-name",
       "linux_chromium_rel_ng",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] maps_pixel_test on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"maps_pixel_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"maps_pixel_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:pixel_test on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:pixel_test on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "pixel",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--build-revision",
       "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--download-refimg-from-cloud-storage",
       "--refimg-cloud-storage-bucket",
       "chromium-gpu-archive/reference-images",
       "--os-type",
       "linux",
       "--test-machine-name",
       "linux_chromium_rel_ng",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] pixel_test on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"pixel_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"pixel_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:webgl_conformance on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:webgl_conformance on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "webgl_conformance",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] webgl_conformance on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"webgl_conformance on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"webgl_conformance on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:context_lost on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:context_lost on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "context_lost",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] context_lost on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"context_lost on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"context_lost on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:memory_test on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:memory_test on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "memory_test",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] memory_test on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"memory_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"memory_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:trace_test on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:trace_test on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "trace_test",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] trace_test on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"trace_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"trace_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:screenshot_sync on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:screenshot_sync on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "screenshot_sync",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] screenshot_sync on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"screenshot_sync on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"screenshot_sync on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:hardware_accelerated_feature on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:hardware_accelerated_feature on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "hardware_accelerated_feature",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] hardware_accelerated_feature on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"hardware_accelerated_feature on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"hardware_accelerated_feature on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:gpu_process_launch on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:gpu_process_launch on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "gpu_process",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] gpu_process_launch on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"gpu_process_launch on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"gpu_process_launch on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:gpu_rasterization on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:gpu_rasterization on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "gpu_rasterization",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--build-revision",
       "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--test-machine-name",
       "linux_chromium_rel_ng",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] gpu_rasterization on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"gpu_rasterization on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"gpu_rasterization on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 349 matching lines @@
       "--shards",
       "1",
       "maps_pixel_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "maps_pixel_test on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "pixel_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "pixel_test on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "webgl_conformance on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "webgl_conformance on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "context_lost on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "context_lost on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "memory_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "memory_test on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "trace_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "trace_test on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "screenshot_sync on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "screenshot_sync on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "hardware_accelerated_feature on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "hardware_accelerated_feature on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "gpu_process_launch on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "gpu_process_launch on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "gpu_rasterization on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "gpu_rasterization on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
@@ skipping 383 matching lines @@
       "@@@SET_BUILD_PROPERTY@failure_type@\"TEST_FAILURE\"@@@",
       "@@@SET_BUILD_PROPERTY@failure_hash@\"2c817ab2d4394c69c9b8a0698b954936d9e1fb76\"@@@"
     ]
   },
   {
     "name": "$result",
     "reason": "1 out of 1 aggregated steps failed. Failures: Step('gl_tests (retry summary)') failed with return_code 1",
     "status_code": 1
   }
 ]