Remove LUCI and test config for mac-cocoa-rel waterfall and trybot.

Bug: 887808
Change-Id: I6ed08f68c1c4b059c412b91c2a6f7952fd44aea4
Reviewed-on: https://chromium-review.googlesource.com/1241493Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593714}

infra/config/global/cr-buildbucket.cfg

@@ -1283,11 +1283,6 @@ buckets {
       mixins: "mac-ci"
       dimensions:"os:Mac-10.13"
     }
-    builders {
-      name: "mac-cocoa-rel"
-      mixins: "mac-ci"
-      dimensions:"os:Mac-10.13"
-    }
     builders {
       name: "Mac Builder (dbg)"
       mixins: "mac-ci"
@@ -3004,7 +2999,6 @@ buckets {
       mixins: "goma-j150"
       name: "mac_chromium_rel_ng"
     }
-    builders { mixins: "mac-try" name: "mac-cocoa-rel" }
     builders {
       mixins: "mac-optional-gpu-try"
       name: "mac_optional_gpu_tests_rel"

infra/config/global/luci-milo.cfg

@@ -428,10 +428,6 @@ consoles {
     category: "chromium.mac|release|tester"
     short_name: "13"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/mac-cocoa-rel"
-    category: "chromium.mac|release|tester|cocoa"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)"
     category: "chromium.mac|debug"
@@ -846,10 +842,6 @@ consoles {
     category: "release|tester"
     short_name: "13"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/mac-cocoa-rel"
-    category: "release|tester|cocoa"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)"
     category: "debug"
@@ -4579,9 +4571,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_10.13_rel_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac-cocoa-rel"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/mac_optional_gpu_tests_rel"
   }

infra/config/global/luci-scheduler.cfg

@@ -2011,17 +2011,6 @@ job {
   }
 }
 
-job {
-  id: "mac-cocoa-rel"
-  # Triggered by "Mac Builder".
-  acl_sets: "triggered-by-parent-builders"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "mac-cocoa-rel"
-  }
-}
-
 job {
   id: "Mac10.13 Tests (dbg)"
   # Triggered by "Mac Builder (dbg)".

testing/buildbot/chromium.mac.json

@@ -5750,72 +5750,6 @@
       }
     ]
   },
-  "mac-cocoa-rel": {
-    "gtest_tests": [
-      {
-        "args": [
-          "--disable-features=ViewsBrowserWindows",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/mac_window_server_killers.browser_tests.filter",
-          "--gtest_shuffle"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "gpu": "none",
-              "os": "Mac-10.13",
-              "pool": "Chrome-quarantine"
-            }
-          ],
-          "shards": 10
-        },
-        "test": "browser_tests"
-      },
-      {
-        "args": [
-          "--disable-features=ViewsBrowserWindows"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Mac-10.13"
-            }
-          ]
-        },
-        "test": "components_browsertests"
-      },
-      {
-        "args": [
-          "--disable-features=ViewsBrowserWindows"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Mac-10.13"
-            }
-          ]
-        },
-        "test": "content_browsertests"
-      },
-      {
-        "args": [
-          "--disable-features=ViewsBrowserWindows"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Mac-10.13"
-            }
-          ],
-          "shards": 3
-        },
-        "test": "interactive_ui_tests"
-      }
-    ]
-  },
   "mac-jumbo-rel": {
     "additional_compile_targets": [
       "all"

testing/buildbot/test_suite_exceptions.pyl

@@ -164,22 +164,6 @@
           ],
         },
       },
-      'mac-cocoa-rel': {
-        # A subset of tests seem to cause WindowServer deaths on VMs.
-        # crbug.com/828031 et al.
-        'args': [
-          '--test-launcher-filter-file=../../testing/buildbot/filters/mac_window_server_killers.browser_tests.filter',
-          '--gtest_shuffle',
-        ],
-        'swarming': {
-          'dimension_sets': [
-            {
-              'pool': 'Chrome-quarantine',
-              'gpu': 'none',
-            },
-          ],
-        },
-      },
       # chromium.memory
       'Linux ASan LSan Tests (1)': {
         # These are very slow on the ASAN trybot for some reason.

testing/buildbot/waterfalls.pyl

@@ -3109,21 +3109,6 @@
           'isolated_scripts': 'chromium_dbg_isolated_scripts',
         },
       },
-      'mac-cocoa-rel': {
-        'swarming': {
-          'dimension_sets': [
-            {
-              'os': 'Mac-10.13',
-            },
-          ],
-        },
-        'test_suites': {
-          'gtest_tests': 'chromium_browser_tests',
-        },
-        'args': [
-          '--disable-features=ViewsBrowserWindows',
-        ],
-      },
       'mac-jumbo-rel': {
         'additional_compile_targets': [
           'all'

tools/mb/mb_config.pyl

@@ -683,7 +683,6 @@
       'mac_chromium_compile_rel_ng': 'gpu_tests_release_trybot',
       'mac_chromium_dbg_ng': 'gpu_tests_debug_trybot',
       'mac_chromium_rel_ng': 'gpu_tests_release_trybot',
-      'mac-cocoa-rel': 'gpu_tests_release_trybot',
       'mac_optional_gpu_tests_rel': 'gpu_fyi_tests_release_trybot',
       'mac_upload_clang': 'release_bot',
       'mac-views-rel': 'mac_views_browser_release_trybot',