Force gpu=none on quarantined mac browser_tests, remove from 10.10.

This sets the gpu=none flag explicitly to get the browser_tests to
run on the VMs in the Chrome-quarantine pool on Mac10.12, to avoid any
confusion with the default gpu values for the other test suites.

This also temporarily turns off the browser_tests on 10.10, since it
looks like we're probably too low on capacity there to handle this
easily. We'll add more tomorrow and try again.

TBR=jbudorick@chromium.org
BUG=828031
NOTRY=true

Change-Id: Ib948ba17c2bb3b4fb56912a9c612e72fa5e08f11
Reviewed-on: https://chromium-review.googlesource.com/1103938
Commit-Queue: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567933}

testing/buildbot/chromium.mac.json

@@ -68,22 +68,6 @@
         },
         "test": "boringssl_ssl_tests"
       },
-      {
-        "args": [
-          "--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": [
-            {
-              "pool": "Chrome-quarantine"
-            }
-          ],
-          "shards": 10
-        },
-        "test": "browser_tests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -627,6 +611,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "gpu": "none",
               "pool": "Chrome-quarantine"
             }
           ],
@@ -1225,7 +1210,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "8086:0a2e",
+              "gpu": "none",
               "os": "Mac-10.12.6",
               "pool": "Chrome-quarantine"
             }
@@ -2193,6 +2178,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "gpu": "none",
               "pool": "Chrome-quarantine"
             }
           ],
@@ -2746,6 +2732,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "gpu": "none",
               "pool": "Chrome-quarantine"
             }
           ],

testing/buildbot/test_suite_exceptions.pyl

@@ -202,6 +202,8 @@
       'Chromium Mac 10.13', # https://crbug.com/828031
       'Out of Process Profiling Mac', # https://crbug.com/828031
       'mac-views-rel', # https://crbug.com/828031
+      # chromium.mac
+      'Mac10.10 Tests', # https://crbug.com/828031
       # chromium.memory
       'Linux TSan Tests',  # https://crbug.com/368525
       'Mac ASan 64 Tests (1)', # https://crbug.com/828031
@@ -233,21 +235,6 @@
         },
       },
       # chromium.mac
-      'Mac10.10 Tests': {
-        # 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',
-            },
-          ],
-        },
-      },
       'Mac10.11 Tests': {
         # A subset of tests seem to cause WindowServer deaths on VMs.
         # crbug.com/828031 et al.
@@ -259,6 +246,7 @@
           'dimension_sets': [
             {
               'pool': 'Chrome-quarantine',
+              'gpu': 'none',
             },
           ],
         },
@@ -274,6 +262,7 @@
           'dimension_sets': [
             {
               'pool': 'Chrome-quarantine',
+              'gpu': 'none',
             },
           ],
         },
@@ -290,6 +279,7 @@
           'dimension_sets': [
             {
               'pool': 'Chrome-quarantine',
+              'gpu': 'none',
             },
           ],
         },
@@ -305,6 +295,7 @@
           'dimension_sets': [
             {
               'pool': 'Chrome-quarantine',
+              'gpu': 'none',
             },
           ],
         },