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

masters/master.tryserver.chromium/master.cfg

Index: masters/master.tryserver.chromium/master.cfg
diff --git a/masters/master.tryserver.chromium/master.cfg b/masters/master.tryserver.chromium/master.cfg
index 6ae78946b9977d03b8abe72f99e3805a99f2cade..f70d3ef3f878289a3dfcdb9736ca46075bc216b4 100644
--- a/masters/master.tryserver.chromium/master.cfg
+++ b/masters/master.tryserver.chromium/master.cfg
@@ -399,36 +399,6 @@ linux_tests_full_name = [
 ] + chromium_factory.blink_tests_for_chromium_tryjobs
 
 
-b_linux = CreateBuilder(
-    platform='linux',
-    target='Debug',
-    goma=True,
-    options=linux_targets,
-    tests=linux_tests,
-    builder_name='linux')
-
-pools['chrome'].append('linux')
-
-b_linux_rel = CreateBuilder(
-    platform='linux',
-    target='Release',
-    goma=True,
-    options=linux_targets,
-    tests=linux_tests + ['sizes_br'],
-    builder_name='linux_rel',
-    slavebuilddir='linux',
-    factory_properties={
-      'swarming_triggered_builder': 'linux_swarm_triggered',
-      'use_xvfb_on_linux': True,
-    },
-    run_default_swarm_tests=[
-      'base_unittests',
-      'browser_tests',
-      'interactive_ui_tests',
-      'net_unittests',
-      'unit_tests',
-    ])
-
 b_linux_rel_naclmore = CreateBuilder(
     platform='linux',
     target='Release',
@@ -503,37 +473,6 @@ mac_tests = [
  'webkit_compositor_bindings_unittests_br',
 ] + chromium_factory.blink_tests_for_chromium_tryjobs
 
-b_mac = CreateBuilder(
-    platform='mac',
-    target='Debug',
-    options=mac_targets,
-    tests=mac_tests,
-    builder_name='mac',
-    goma=True,
-    clang=True)
-
-pools['chrome'].append('mac')
-
-b_mac_rel = CreateBuilder(
-    platform='mac',
-    target='Release',
-    options=mac_targets,
-    tests=mac_tests + ['sizes_br'],
-    builder_name='mac_rel',
-    slavebuilddir='mac',
-    goma=True,
-    clang=True,
-    factory_properties={
-      'swarming_triggered_builder': 'mac_swarm_triggered',
-    },
-    run_default_swarm_tests=[
-      'base_unittests',
-      'browser_tests',
-      'interactive_ui_tests',
-      'net_unittests',
-      'unit_tests',
-    ])
-
 b_mac_rel_naclmore = CreateBuilder(
     platform='mac',
     target='Release',
@@ -618,41 +557,6 @@ win_tests = [
   'webkit_compositor_bindings_unittests_br',
 ] + chromium_factory.blink_tests_for_chromium_tryjobs
 
-b_win = CreateBuilder(
-    target='Debug',
-    platform='win32',
-    options=win_targets,
-    tests=win_tests,
-    builder_name='win',
-    factory_properties={
-      'gclient_env': {
-      },
-    },
-    goma=True)
-
-pools['chrome'].append('win')
-
-b_win_rel = CreateBuilder(
-    target='Release',
-    platform='win32',
-    options=win_targets,
-    tests=win_tests + ['sizes_br'],
-    builder_name='win_rel',
-    slavebuilddir='win',
-    factory_properties={
-      'gclient_env': {
-      },
-      'swarming_triggered_builder': 'win_swarm_triggered',
-    },
-    goma=True,
-    run_default_swarm_tests=[
-      'base_unittests',
-      'browser_tests',
-      'interactive_ui_tests',
-      'net_unittests',
-      'unit_tests',
-    ])
-
 b_win_rel_naclmore = CreateBuilder(
     target='Release',
     platform='win32',
@@ -671,20 +575,6 @@ win_x64_options = [
   '--', 'all'
 ]
 
-b_win_x64_rel = CreateBuilder(
-    target='Release_x64',
-    platform='win32',
-    options=win_x64_options,
-    tests=win_tests,
-    builder_name='win_x64_rel',
-    slavebuilddir='win',
-    goma=True,
-    ninja=True,
-    factory_properties={
-      'gclient_env': {
-         'GYP_DEFINES': 'component=shared_library target_arch=x64',
-    }})
-
 # Tests that are single-machine shard-safe on Linux ChromeOS
 linux_chromeos_sharded = [
   'accessibility_unittests',
@@ -774,24 +664,6 @@ browser_tests = [
   ('interactive_ui_tests_br', 'interactive_ui_tests'),
 ]
 
-# Chromium for ChromiumOS
-b_linux_chromeos = {
-  'name': 'linux_chromeos',
-  'factory': m_chromium_chromiumos.ChromiumOSFactory(
-      slave_type='Trybot',
-      target='Release',
-      tests=extract_tests(linux_chromeos_tests),
-      options=['--compiler=goma'] + extract_options(linux_chromeos_tests),
-      factory_properties={
-        'sharded_tests': sharded_tests,
-        'gclient_env': {
-          'GYP_DEFINES': ('chromeos=1 fastbuild=1'
-                          ' dcheck_always_on=1'
-                          ' ffmpeg_branding=ChromeOS'
-                          ' component=shared_library'
-                          ' proprietary_codecs=1')}})
-}
-
 b_android_aosp = {
   'name': 'android_aosp',
   'factory': m_annotator.BaseFactory('android_webview_aosp'),
@@ -1548,43 +1420,6 @@ b_swarms = [
   } for name in ('linux', 'mac', 'win')
 ]
 
-
-# Clang builders
-b_linux_clang = CreateBuilder(
-    platform='linux',
-    target='Debug',
-    options=linux_targets,
-    tests=linux_tests,
-    builder_name='linux_clang',
-    goma=True,
-    clang=True,
-    # Keep all tests off by default.
-    factory_properties={
-      'non_default': linux_tests_full_name,
-      'gclient_env': {
-        'GYP_DEFINES': 'clang_use_chrome_plugins=1',
-      },
-    })
-
-b_linux_chromeos_clang = {
-  'name': 'linux_chromeos_clang',
-  'factory': m_chromium_chromiumos.ChromiumOSFactory(
-      slave_type='Trybot',
-      target='Debug',
-      options=['--build-tool=ninja', '--compiler=goma-clang'] +
-        extract_options(linux_chromeos_tests),
-      tests=[],
-      factory_properties={
-        # CreateBuilder() adds "fastbuild=1" for the other 2 clang bots.
-        'gclient_env': {
-          'GYP_GENERATORS': 'ninja',
-          'GYP_DEFINES': ('chromeos=1'
-                          ' clang=1 clang_use_chrome_plugins=1'
-                          ' fastbuild=1'
-                          ' ffmpeg_branding=ChromeOS proprietary_codecs=1'
-                          ' component=shared_library')}})
-}
-
 # this matches the bot on the main waterfall soon
 b_win8_aura = CreateBuilder(
     platform='win32',
@@ -2114,13 +1949,10 @@ b_tools_build_presubmit = presubmit('tools_build')
 
 
 c['builders'] = [
-  b_linux_rel, b_linux_rel_alt,
   b_linux_rel_precise32,
-  b_mac_rel, b_win_rel,
-  b_mac_x64_rel, b_win_x64_rel,
+  b_linux_rel_alt,
+  b_mac_x64_rel,
   b_linux_rel_naclmore, b_mac_rel_naclmore, b_win_rel_naclmore,
-  b_linux_clang,
-  b_linux, b_mac, b_win,
   b_android_dbg, b_android_dbg_triggered_tests,
   b_android_fyi_dbg, b_android_fyi_dbg_triggered_tests,
   b_android_x86_dbg,
@@ -2128,7 +1960,6 @@ c['builders'] = [
   b_android_clang_dbg, b_android_rel, b_android_rel_triggered_tests,
   b_android_aosp,
   b_ios_rel_device, b_ios_dbg_simulator, b_ios_rel_device_ninja,
-  b_linux_chromeos,
   b_valgrind_linux, b_valgrind_mac,
   b_linux_chromeos_valgrind,
   b_tsan_linux, b_tsan_win, b_drmemory_win,
@@ -2136,7 +1967,6 @@ c['builders'] = [
   b_linux_layout_rel,
   b_linux_layout_asan, b_linux_layout_rel_32,
 ] + b_swarms + [
-  b_linux_chromeos_clang,
   b_win8_aura,
   b_linux_asan, b_linux_browser_asan, b_linux_clang_tsan,
   b_linux_chromeos_asan,