Revert of Build the new Telemetry GPU test isolate on the FYI waterfall.

scripts/slave/recipes/gpu/build_and_test.expected/linux_release_fyi.json

Index: scripts/slave/recipes/gpu/build_and_test.expected/linux_release_fyi.json
diff --git a/scripts/slave/recipes/gpu/build_and_test.expected/linux_release_fyi.json b/scripts/slave/recipes/gpu/build_and_test.expected/linux_release_fyi.json
index f9ad7f1eebec3e10d771e1bd095bd4f244c18280..10a39f83343f6f7ebcb1164139678586ee951350 100644
--- a/scripts/slave/recipes/gpu/build_and_test.expected/linux_release_fyi.json
+++ b/scripts/slave/recipes/gpu/build_and_test.expected/linux_release_fyi.json
@@ -151,7 +151,6 @@
       "telemetry_gpu_test_run",
       "audio_unittests_run",
       "content_unittests_run",
-      "telemetry_gpu_new_test_run",
       "angle_end2end_tests_run",
       "angle_deqp_gles2_tests_run"
     ],
@@ -183,7 +182,6 @@
       "[SLAVE_BUILD]/src/out/Release/telemetry_gpu_test.isolated.gen.json",
       "[SLAVE_BUILD]/src/out/Release/audio_unittests.isolated.gen.json",
       "[SLAVE_BUILD]/src/out/Release/content_unittests.isolated.gen.json",
-      "[SLAVE_BUILD]/src/out/Release/telemetry_gpu_new_test.isolated.gen.json",
       "[SLAVE_BUILD]/src/out/Release/angle_end2end_tests.isolated.gen.json",
       "[SLAVE_BUILD]/src/out/Release/angle_deqp_gles2_tests.isolated.gen.json"
     ],
@@ -202,11 +200,10 @@
       "@@@STEP_LOG_LINE@json.output@  \"gles2_conform_test\": \"[dummy hash for gles2_conform_test]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"gpu_unittests\": \"[dummy hash for gpu_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@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"angle_deqp_gles2_tests\": \"[dummy hash for angle_deqp_gles2_tests]\", \"angle_end2end_tests\": \"[dummy hash for angle_end2end_tests]\", \"angle_unittests\": \"[dummy hash for angle_unittests]\", \"audio_unittests\": \"[dummy hash for audio_unittests]\", \"content_gl_tests\": \"[dummy hash for content_gl_tests]\", \"content_unittests\": \"[dummy hash for content_unittests]\", \"gl_tests\": \"[dummy hash for gl_tests]\", \"gl_unittests\": \"[dummy hash for gl_unittests]\", \"gles2_conform_test\": \"[dummy hash for gles2_conform_test]\", \"gpu_unittests\": \"[dummy hash for gpu_unittests]\", \"tab_capture_end2end_tests\": \"[dummy hash for tab_capture_end2end_tests]\", \"telemetry_gpu_new_test\": \"[dummy hash for telemetry_gpu_new_test]\", \"telemetry_gpu_test\": \"[dummy hash for telemetry_gpu_test]\"}@@@"
+      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"angle_deqp_gles2_tests\": \"[dummy hash for angle_deqp_gles2_tests]\", \"angle_end2end_tests\": \"[dummy hash for angle_end2end_tests]\", \"angle_unittests\": \"[dummy hash for angle_unittests]\", \"audio_unittests\": \"[dummy hash for audio_unittests]\", \"content_gl_tests\": \"[dummy hash for content_gl_tests]\", \"content_unittests\": \"[dummy hash for content_unittests]\", \"gl_tests\": \"[dummy hash for gl_tests]\", \"gl_unittests\": \"[dummy hash for gl_unittests]\", \"gles2_conform_test\": \"[dummy hash for gles2_conform_test]\", \"gpu_unittests\": \"[dummy hash for gpu_unittests]\", \"tab_capture_end2end_tests\": \"[dummy hash for tab_capture_end2end_tests]\", \"telemetry_gpu_test\": \"[dummy hash for telemetry_gpu_test]\"}@@@"
     ]
   },
   {
@@ -439,43 +436,6 @@
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "content_unittests"
-  },
-  {
-    "allow_subannotations": true,
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILD]/scripts/slave/runtest.py",
-      "--target",
-      "Release",
-      "--no-xvfb",
-      "--factory-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.gpu.fyi\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
-      "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.gpu.fyi\", \"project\": \"\", \"recipe\": \"gpu/build_and_test\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
-      "--annotate=gtest",
-      "--test-type=telemetry_gpu_new_test",
-      "--step-name=telemetry_gpu_new_test",
-      "--generate-json-file",
-      "--results-directory=[SLAVE_BUILD]/gtest-results/telemetry_gpu_new_test",
-      "--test-launcher-summary-output",
-      "/path/to/tmp/json",
-      "--builder-name=TestBuilder",
-      "--slave-name=TestSlavename",
-      "--build-number=571",
-      "--run-python-script",
-      "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
-      "--webkit-revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
-      "[SLAVE_BUILD]/src/tools/swarming_client/run_isolated.py",
-      "--isolated",
-      "[dummy hash for telemetry_gpu_new_test]",
-      "-I",
-      "https://isolateserver.appspot.com",
-      "--",
-      "--use-gpu-in-tests"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "telemetry_gpu_new_test"
   },
   {
     "allow_subannotations": true,