Decommission old Win and Linux Intel GPU bots.

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

Index: scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_GPU_Win_Builder.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_GPU_Win_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_GPU_Win_Builder.json
index a3e8f0c9bce19656bf9c20e00c8f478c6882c9c1..59442171ff7d856ce9ed81671345b06c7de2b8f9 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_GPU_Win_Builder.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_GPU_Win_Builder.json
@@ -204,16 +204,6 @@
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"Win7 Release (Intel)\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"gtest_tests\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"can_use_on_swarming_builders\": true@@@",
-      "@@@STEP_LOG_LINE@json.output@        }, @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"test\": \"browser_tests\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"Win7 Release (NVIDIA GeForce 730)\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"gtest_tests\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
@@ -489,33 +479,6 @@
     "name": "trigger (4)",
     "trigger_specs": [
       {
-        "builder_name": "Win7 Release (Intel)",
-        "properties": {
-          "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
-          "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
-          "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
-          "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
-          "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
-          "parent_got_revision_cp": "refs/heads/master@{#170242}",
-          "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
-          "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
-          "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
-          "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
-          "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
-          "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}"
-        }
-      }
-    ],
-    "~followup_annotations": [
-      "@@@STEP_TEXT@Win7 Release (Intel)@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "trigger (5)",
-    "trigger_specs": [
-      {
         "builder_name": "Win7 Release (NVIDIA GeForce 730)",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -540,7 +503,7 @@
   {
     "cmd": [],
     "cwd": "[SLAVE_BUILD]",
-    "name": "trigger (6)",
+    "name": "trigger (5)",
     "trigger_specs": [
       {
         "builder_name": "Win7 Release (NVIDIA)",
@@ -567,7 +530,7 @@
   {
     "cmd": [],
     "cwd": "[SLAVE_BUILD]",
-    "name": "trigger (7)",
+    "name": "trigger (6)",
     "trigger_specs": [
       {
         "builder_name": "Win7 Release (New Intel)",
@@ -594,7 +557,7 @@
   {
     "cmd": [],
     "cwd": "[SLAVE_BUILD]",
-    "name": "trigger (8)",
+    "name": "trigger (7)",
     "trigger_specs": [
       {
         "builder_name": "Win8 Release (NVIDIA)",