Remove non-recipe builders from tryserver.chromium that have recipe equivalents

masters/master.tryserver.chromium/slaves.cfg

Index: masters/master.tryserver.chromium/slaves.cfg
diff --git a/masters/master.tryserver.chromium/slaves.cfg b/masters/master.tryserver.chromium/slaves.cfg
index fbc4c0889ebdd733bfe76c81bf96faee1c810383..3358566d8c0e4f2ca54dc6726893710f5fd694f9 100644
--- a/masters/master.tryserver.chromium/slaves.cfg
+++ b/masters/master.tryserver.chromium/slaves.cfg
@@ -46,16 +46,14 @@ def linux():
   # Configurations on every VM.
   base = presubmit_builders + [
     # One line per shared directory. In decreasing usage:
-    'linux', 'linux_rel',
     'linux_chromium_dbg', 'linux_chromium_rel',
     'linux_chromium_compile_dbg', 'linux_chromium_compile_rel',
     'linux_rel_naclmore',
     'linux_chromium_gn_dbg', 'linux_chromium_gn_rel',
     'android_chromium_gn_compile_dbg', 'android_chromium_gn_compile_rel',
 
-    'linux_clang', 'linux_chromium_clang_dbg', 'linux_chromium_clang_rel',
+    'linux_chromium_clang_dbg', 'linux_chromium_clang_rel',
 
-    'linux_chromeos',
     'linux_chromium_chromeos_dbg', 'linux_chromium_chromeos_rel',
     'linux_nacl_sdk_build',
 
@@ -67,8 +65,7 @@ def linux():
   # increase the "cache locally" of having a checkout already recent on the
   # slave.
   extras = [
-    [['linux_chromeos_clang',
-      'linux_chromium_chromeos_clang_dbg',
+    [['linux_chromium_chromeos_clang_dbg',
       'linux_chromium_chromeos_clang_rel'], 15],
     [['linux_chromeos_valgrind'], 2],
     [['linux_valgrind', 'linux_tsan'], 4],
@@ -285,7 +282,7 @@ def mac():
       'master': 'TryServer',
       'builder': [
           # One line per shared directory:
-          'mac', 'mac_rel', 'mac_rel_naclmore',
+          'mac_rel_naclmore',
           'mac_chromium_dbg', 'mac_chromium_rel',
           'mac_chromium_compile_dbg', 'mac_chromium_compile_rel',
 
@@ -504,7 +501,7 @@ def windows():
     {
       'master': 'TryServer',
       'builder': [
-        'win', 'win_rel_naclmore', 'win_rel',
+        'win_rel_naclmore',
         'win_chromium_rel', 'win_chromium_compile_rel',
         'win_nacl_sdk_build'
       ],
@@ -528,7 +525,7 @@ def windows():
     {
       'master': 'TryServer',
       'builder': [
-        'win_x64_rel', 'win_chromium_x64_dbg', 'win_chromium_x64_rel'
+        'win_chromium_x64_dbg', 'win_chromium_x64_rel'
       ],
       'hostname': 'vm%d-m4' % number,
       'os': 'win',