Remove obsolete Mac bots from generate_buildbot_json.py.

content/test/gpu/generate_buildbot_json.py

Index: content/test/gpu/generate_buildbot_json.py
diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py
index 79c00ec4c9e17570181c013d50c48d6b55001b64..0ad1f3e4f26bbe0f047ca049c3494012adfc1aa7 100755
--- a/content/test/gpu/generate_buildbot_json.py
+++ b/content/test/gpu/generate_buildbot_json.py
@@ -138,54 +138,6 @@ WATERFALL = {
       'swarming': True,
       'os_type': 'mac',
     },
-    # BEGIN obsolete Mac bots -- remove after waterfall restarted successfully.
-    'Mac 10.10 Release (Intel)': {
-      'swarming_dimensions': [
-        {
-          'gpu': '8086:0a2e',
-          'os': 'Mac-10.12'
-        },
-      ],
-      'build_config': 'Release',
-      'swarming': True,
-      'os_type': 'mac',
-    },
-    'Mac 10.10 Debug (Intel)': {
-      'swarming_dimensions': [
-        {
-          'gpu': '8086:0a2e',
-          'os': 'Mac-10.12'
-        },
-      ],
-      'build_config': 'Debug',
-      'swarming': True,
-      'os_type': 'mac',
-    },
-    'Mac 10.10 Retina Release (AMD)': {
-      'swarming_dimensions': [
-        {
-          'gpu': '1002:6821',
-          'hidpi': '1',
-          'os': 'Mac'
-        },
-      ],
-      'build_config': 'Release',
-      'swarming': True,
-      'os_type': 'mac',
-    },
-    'Mac 10.10 Retina Debug (AMD)': {
-      'swarming_dimensions': [
-        {
-          'gpu': '1002:6821',
-          'hidpi': '1',
-          'os': 'Mac'
-        },
-      ],
-      'build_config': 'Debug',
-      'swarming': True,
-      'os_type': 'mac',
-    },
-    # END obsolete Mac bots -- remove after waterfall restarted successfully.
     'Linux Release (NVIDIA)': {
       'swarming_dimensions': [
         {
@@ -399,117 +351,6 @@ FYI_WATERFALL = {
       'swarming': True,
       'os_type': 'win',
     },
-    # BEGIN obsolete Mac bots -- remove after waterfall restarted successfully.
-    'Mac 10.10 Release (Intel)': {
-      'swarming_dimensions': [
-        {
-          'gpu': '8086:0a2e',
-          'os': 'Mac-10.12'
-        },
-      ],
-      'build_config': 'Release',
-      'swarming': True,
-      'os_type': 'mac',
-    },
-    'Mac 10.10 Debug (Intel)': {
-      'swarming_dimensions': [
-        {
-          'gpu': '8086:0a2e',
-          'os': 'Mac-10.12'
-        },
-      ],
-      'build_config': 'Debug',
-      'swarming': True,
-      'os_type': 'mac',
-    },
-    'Mac 10.10 Release (AMD)': {
-      'swarming_dimensions': [
-        {
-          'gpu': '1002:679e',
-          'os': 'Mac-10.10'
-        },
-      ],
-      'build_config': 'Release',
-      # This bot is a one-off and doesn't have similar slaves in the
-      # swarming pool.
-      'swarming': False,
-      'os_type': 'mac',
-    },
-    'Mac 10.10 Debug (AMD)': {
-      'swarming_dimensions': [
-        {
-          'gpu': '1002:679e',
-          'os': 'Mac-10.10'
-        },
-      ],
-      'build_config': 'Debug',
-      # This bot is a one-off and doesn't have similar slaves in the
-      # swarming pool.
-      'swarming': False,
-      'os_type': 'mac',
-    },
-    'Mac Retina Release': {
-      'swarming_dimensions': [
-        {
-          'gpu': '10de:0fe9',
-          'hidpi': '1',
-          'os': 'Mac'
-        },
-      ],
-      'build_config': 'Release',
-      'swarming': True,
-      'os_type': 'mac',
-    },
-    'Mac Retina Debug': {
-      'swarming_dimensions': [
-        {
-          'gpu': '10de:0fe9',
-          'hidpi': '1',
-          'os': 'Mac'
-        },
-      ],
-      'build_config': 'Debug',
-      'swarming': True,
-      'os_type': 'mac',
-    },
-    'Mac 10.10 Retina Release (AMD)': {
-      'swarming_dimensions': [
-        {
-          'gpu': '1002:6821',
-          'hidpi': '1',
-          'os': 'Mac'
-        },
-      ],
-      'build_config': 'Release',
-      'swarming': True,
-      'os_type': 'mac',
-    },
-    'Mac 10.10 Retina Debug (AMD)': {
-      'swarming_dimensions': [
-        {
-          'gpu': '1002:6821',
-          'hidpi': '1',
-          'os': 'Mac'
-        },
-      ],
-      'build_config': 'Debug',
-      'swarming': True,
-      'os_type': 'mac',
-    },
-    'Mac 10.11 Retina Release (AMD)': {
-      'swarming_dimensions': [
-        {
-          'gpu': '1002:6821',
-          'hidpi': '1',
-          'os': 'Mac'
-        },
-      ],
-      'build_config': 'Release',
-      # This bot is a one-off for testing purposes.
-      'swarming': False,
-      'os_type': 'mac',
-    },
-    # END obsolete Mac bots -- remove after waterfall restarted successfully.
     'Mac Release (Intel)': {
       'swarming_dimensions': [
         {