Remove Mac Valgrind from the memory.fyi waterfall.

masters/master.chromium.memory.fyi/master.cfg

Index: masters/master.chromium.memory.fyi/master.cfg
diff --git a/masters/master.chromium.memory.fyi/master.cfg b/masters/master.chromium.memory.fyi/master.cfg
index bc15618f2c9aed42a986ca5ed03f21cc59b0dd17..f141ea1ef80764bd0d395a44af5a0d04bef43fc0 100644
--- a/masters/master.chromium.memory.fyi/master.cfg
+++ b/masters/master.chromium.memory.fyi/master.cfg
@@ -46,7 +46,6 @@ s_chromium = Scheduler(name='chromium',
                                      'Chromium Windows Builder (DrMemory)',
                                      'Chromium Windows Builder (DrMemory x64)',
                                      'Chromium Linux Builder (valgrind)',
-                                     'Chromium Mac Builder (valgrind)',
                                      'Chromium OS Builder (valgrind)',
                                      'Chromium Linux TSan Builder',
                                      'Chromium Linux MSan Builder',
@@ -96,12 +95,6 @@ s_chromium_linux_valgrind_trigger = Triggerable(
      'Linux Tests (valgrind)(5)',
     ])
 
-s_chromium_mac_valgrind_trigger = Triggerable(
-    'chromium_mac_valgrind',
-    ['Chromium Mac (valgrind)(1)',
-     'Chromium Mac (valgrind)(2)',
-    ])
-
 s_chromium_chromeos_valgrind_trigger = Triggerable(
     'chromium_chromeos_valgrind',
     ['Chromium OS (valgrind)(1)',
@@ -128,7 +121,6 @@ c['schedulers'] = [s_chromium,
                    s_chromium_win_drmemory_trigger,
                    s_chromium_win_drmemory_64_trigger,
                    s_chromium_linux_valgrind_trigger,
-                   s_chromium_mac_valgrind_trigger,
                    s_chromium_chromeos_valgrind_trigger,
                    s_chromium_linux_tsan,
                    s_chromium_linux_msan,
@@ -154,14 +146,12 @@ builders = []
 m_win = chromium_factory.ChromiumFactory('src/build', 'win32')
 m_win_ninja = chromium_factory.ChromiumFactory('src/out', 'win32')
 m_linux = chromium_factory.ChromiumFactory('src/out', 'linux2')
-m_mac = chromium_factory.ChromiumFactory('src/xcodebuild', 'darwin')
 m_chromeos = chromium_factory.ChromiumFactory('src/out', 'linux2')
 
 # Some shortcut to simplify the code below.
 F_WIN = m_win.ChromiumFactory
 F_WIN_NINJA = m_win_ninja.ChromiumFactory
 F_LINUX = m_linux.ChromiumFactory
-F_MAC = m_mac.ChromiumFactory
 F_CR_OS = m_chromeos.ChromiumOSFactory
 
 m_annotator = annotator_factory.AnnotatorFactory()
@@ -175,14 +165,10 @@ chromium_win_drmemory_64_archive = master_config.GetGSUtilUrl(
 chromium_linux_valgrind_archive = master_config.GetGSUtilUrl(
     'chromium-memory-fyi', 'chromium-rel-linux-valgrind-builder')
 
-chromium_mac_valgrind_archive = master_config.GetGSUtilUrl(
-    'chromium-memory-fyi', 'chromium-rel-mac-valgrind-builder')
-
 chromium_chromeos_valgrind_archive = master_config.GetGSUtilUrl(
     'chromium-memory-fyi', 'chromium-rel-chromeos-valgrind-builder')
 
 valgrind_cros_gyp_defines = 'build_for_tool=memcheck chromeos=1'
-valgrind_mac_gyp_defines = 'build_for_tool=memcheck'
 
 # IMPORTANT NOTE about adding new tests.
 # If you want to add a new test, make sure it's:
@@ -196,8 +182,6 @@ valgrind_mac_gyp_defines = 'build_for_tool=memcheck'
 # under the tool and order the tests in a short-job-first manner if possible.
 #
 # Regarding (a),
-#   New Valgrind/Mac tests must first be added as dependencies to the
-#     'chromium_builder_dbg_valgrind_mac' target in src/build/all.gyp;
 #   New DrMemory/Win tests must first be added as dependencies to the
 #     'chromium_builder_dbg_drmemory_win' target in src/build/all.gyp;
 #
@@ -215,56 +199,6 @@ valgrind_mac_gyp_defines = 'build_for_tool=memcheck'
 
 f_chromium_rel_linux_valgrind = m_annotator.BaseFactory('chromium')
 
-# Mac Valgrind bots:
-# We use debug builds for mac valgrind bots because we can't get stacks on
-# release builds.
-f_cr_rel_mac_valgrind_builder = F_MAC(
-    slave_type='Builder',
-    target='Debug',
-    factory_properties={
-        'gclient_env': { 'GYP_DEFINES' : valgrind_mac_gyp_defines },
-        'trigger': 'chromium_mac_valgrind',
-        'build_url': chromium_mac_valgrind_archive,
-    },
-    options=[
-        '--compiler=goma-clang', '--', '-project', '../build/all.xcodeproj',
-        '-target', 'chromium_builder_dbg_valgrind_mac'])
-
-# unit_tests are disabled under Valgrind on Mac OS because of crbug.com/51716.
-# content_unittests are similarly disabled due to crbug.com/435344.
-# We're still building them to be able to reproduce the crashes on bots.
-f_cr_dbg_mac_valgrind_1 = F_MAC(
-    build_url=chromium_mac_valgrind_archive,
-    slave_type='Tester',
-    factory_properties={ 'needs_valgrind' : True, },
-    # See IMPORTANT NOTE above before adding new tests.
-    tests=['valgrind_base_unittests',
-           'valgrind_crypto',
-           'valgrind_url',
-           'valgrind_ipc_tests',
-           'valgrind_media',
-           'valgrind_midi',
-           'valgrind_printing',
-           'valgrind_sql',
-           'valgrind_ui_base_unittests',
-           # See above.
-           #'valgrind_unit_1_of_4',
-           #'valgrind_unit_2_of_4',
-           ])
-
-f_cr_dbg_mac_valgrind_2 = F_MAC(
-    build_url=chromium_mac_valgrind_archive,
-    slave_type='Tester',
-    factory_properties={ 'needs_valgrind' : True, },
-    # See IMPORTANT NOTE above before adding new tests.
-    tests=['valgrind_net',
-           'valgrind_remoting',
-           # See above.
-           #'valgrind_content',
-           #'valgrind_unit_3_of_4',
-           #'valgrind_unit_4_of_4',
-           ])
-
 # ChromeOS Valgrind bots:
 f_chromium_rel_chromeos_valgrind_builder = F_CR_OS(
     target='Release',
@@ -760,30 +694,6 @@ b_chromium_rel_linux_valgrind_tests_5 = {
   'auto_reboot': True,
 }
 
-b_chromium_rel_mac_valgrind_builder = {
-  'name': 'Chromium Mac Builder (valgrind)',
-  'builddir': 'chromium-rel-mac-valgrind-builder',
-  'factory': f_cr_rel_mac_valgrind_builder,
-  'category': '2Mac Valgrind|compile',
-  'auto_reboot': False,
-}
-
-b_chromium_dbg_mac_valgrind_1 = {
-  'name': 'Chromium Mac (valgrind)(1)',
-  'builddir': 'chromium-dbg-mac-valgrind-1',
-  'factory': f_cr_dbg_mac_valgrind_1,
-  'category': '2Mac Valgrind|memory_tester',
-  'auto_reboot': True,
-}
-
-b_chromium_dbg_mac_valgrind_2 = {
-  'name': 'Chromium Mac (valgrind)(2)',
-  'builddir': 'chromium-dbg-mac-valgrind-2',
-  'factory': f_cr_dbg_mac_valgrind_2,
-  'category': '2Mac Valgrind|memory_tester',
-  'auto_reboot': True,
-}
-
 b_chromium_rel_chromeos_valgrind_builder = {
   'name': 'Chromium OS Builder (valgrind)',
   'builddir': 'chromium-rel-chromeos-valgrind-builder',
@@ -975,10 +885,6 @@ c['builders'] = [
   b_chromium_rel_linux_valgrind_tests_4,
   b_chromium_rel_linux_valgrind_tests_5,
 
-  b_chromium_rel_mac_valgrind_builder,
-  b_chromium_dbg_mac_valgrind_1,
-  b_chromium_dbg_mac_valgrind_2,
-
   b_chromium_rel_chromeos_valgrind_builder,
   b_chromium_rel_chromeos_valgrind_1,
   b_chromium_rel_chromeos_valgrind_2,