Revert of Add most remaining tests to Chromium recipe GPU FYI bots.

tools/mb/mb_config.pyl

Index: tools/mb/mb_config.pyl
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 1d43f27ffbc3625a8a6687403b0c62127f7e826c..a30ba8e6cd7234ee58e9c18dc73f5972bd7d15d0 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -78,8 +78,6 @@
     'swarming_asan_lsan_gyp_release_trybot': ['swarming', 'asan', 'lsan', 'release_trybot'],
     'swarming_msan_gyp_release_trybot': ['swarming', 'chromeos', 'msan', 'gyp', 'release_trybot'],
     'swarming_deterministic_gyp_release_bot': ['swarming', 'deterministic', 'gyp', 'release_bot'],
-    'swarming_gpu_tests_gn_debug_bot': ['swarming', 'gpu_tests', 'gn', 'debug_bot'],
-    'swarming_gpu_tests_gn_release_bot': ['swarming', 'gpu_tests', 'gn', 'release_bot'],
     'swarming_gpu_tests_gn_release_trybot': ['swarming', 'gpu_tests', 'gn', 'release_trybot'],
     'swarming_gpu_tests_gyp_debug_trybot': ['swarming', 'gpu_tests', 'gyp', 'debug_trybot'],
     'swarming_gpu_tests_gyp_release_trybot': ['swarming', 'gpu_tests', 'gyp', 'release_trybot'],
@@ -526,8 +524,8 @@
       'Linux ARM': 'swarming_gyp_release_bot_arm',
     },
     'chromium.gpu.fyi': {
-      'GPU NextGen Linux Builder': 'swarming_gpu_tests_gn_release_bot',
-      'GPU NextGen Linux Builder (dbg)': 'swarming_gpu_tests_gn_debug_bot',
+      'GPU NextGen Linux Builder': 'swarming_gn_release_bot',
+      'GPU NextGen Linux Builder (dbg)': 'swarming_gn_debug_bot',
       'Linux NextGen Release (NVIDIA)': 'none',
       'Linux NextGen Debug (NVIDIA)': 'none',
     },