Remove obsolete trybots, round #1

masters/master.tryserver.chromium.mac/master.cfg

Index: masters/master.tryserver.chromium.mac/master.cfg
diff --git a/masters/master.tryserver.chromium.mac/master.cfg b/masters/master.tryserver.chromium.mac/master.cfg
index 12426906bd929c687c1691953fee9e05d488d55e..44f7e85d386f566cd46b5c19492726061ea7467a 100644
--- a/masters/master.tryserver.chromium.mac/master.cfg
+++ b/masters/master.tryserver.chromium.mac/master.cfg
@@ -99,27 +99,6 @@ mac_tests = [
  'url_unittests_br',
 ] + chromium_factory.blink_tests_for_chromium_tryjobs
 
-b_mac_rel_naclmore = CreateBuilder(
-    platform='mac',
-    target='Release',
-    options=['all'],
-    tests=['nacl_integration_br', 'buildrunner_tests'],
-    builder_name='mac_rel_naclmore',
-    slavebuilddir='mac',
-    goma=True,
-    clang=True)
-
-b_mac_xcodebuild = CreateBuilder(
-    platform='mac',
-    target='Release',
-    options=mac_targets,
-    tests=[],
-    builder_name='mac_xcodebuild',
-    slavebuilddir='mac',
-    goma=True,
-    clang=True,
-    ninja=False)
-
 b_mac_x64_rel = CreateBuilder(
     platform='mac',
     target='Release',
@@ -151,40 +130,6 @@ b_ios_rel_device_ninja = {
   'factory': m_annotator.BaseFactory('chromium'),
 }
 
-b_valgrind_mac = {
-  'name': 'mac_valgrind',
-  'factory': m_chromium_mac.ChromiumFactory(
-      slave_type='Trybot',
-      target='Debug',
-      # This trybot will build every build target. We can speed up the build
-      # for Valgrind by building only what we really need if/when we want to.
-      # See http://crbug.com/42298
-      tests=master_config_tryserver.valgrind_tests([
-        # Re-enable when mac valgrind gives useful data (crbug.com/266147).
-        # 'base_unittests',
-        # Re-enable when http://crbug.com/130744 is fixed (BSODs on the trybot)
-        # 'content',
-        'cast',
-        'crypto_unittests',
-        'device_unittests',
-        'gcm_unit_tests',
-        'media',
-        'net',
-        'printing',
-        'remoting',
-        'sql',
-        'unit',
-        'url',
-      ]),
-      factory_properties={
-        'needs_valgrind': True,
-        'gclient_env': {
-            'GYP_DEFINES': master_config_tryserver.valgrind_gyp_defines
-        }
-      }
-  ),
-}
-
 chromium_builders = []
 
 for targ in ('_rel', '_dbg'):
@@ -198,11 +143,6 @@ for targ in ('_rel', '_dbg'):
     'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600),
     # Share build directory with compatible existing builders to save space.
     'slavebuilddir': 'mac'
-  }, {
-    'name': 'mac_chromium_openssl%s' % targ,
-    'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600),
-    # Share build directory with compatible existing builders to save space.
-    'slavebuilddir': 'mac_openssl'
   }])
 
 chromium_builders.append({
@@ -288,10 +228,8 @@ b_mac_nacl_sdk_build = CreateBuilder(
 
 c['builders'] = [
   b_mac_x64_rel,
-  b_mac_rel_naclmore,
   b_ios_rel_device, b_ios_dbg_simulator, b_ios_rel_device_ninja,
-  b_valgrind_mac,
-  b_mac_asan, b_mac_asan_64, b_mac_xcodebuild,
+  b_mac_asan, b_mac_asan_64,
   b_mac_nacl_sdk,
   b_mac_nacl_sdk_build,
 ] + chromium_builders