Deploy Mac ASAN bot on chromium.gpu.fyi waterfall.

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 1a4a3d57e410a78f0d1436a98ceabd6b93ef6407..ce06fcddef0cf948080e2a859ee497ac211d458f 100755
--- a/content/test/gpu/generate_buildbot_json.py
+++ b/content/test/gpu/generate_buildbot_json.py
@@ -88,7 +88,7 @@ WATERFALL = {
         {
           'gpu': '1002:6821',
           'hidpi': '1',
-          'os': 'Mac-10.10'
+          'os': 'Mac'
         },
       ],
       'build_config': 'Release',
@@ -100,7 +100,7 @@ WATERFALL = {
         {
           'gpu': '1002:6821',
           'hidpi': '1',
-          'os': 'Mac-10.10'
+          'os': 'Mac'
         },
       ],
       'build_config': 'Debug',
@@ -376,7 +376,7 @@ FYI_WATERFALL = {
         {
           'gpu': '1002:6821',
           'hidpi': '1',
-          'os': 'Mac-10.10'
+          'os': 'Mac'
         },
       ],
       'build_config': 'Release',
@@ -388,7 +388,7 @@ FYI_WATERFALL = {
         {
           'gpu': '1002:6821',
           'hidpi': '1',
-          'os': 'Mac-10.10'
+          'os': 'Mac'
         },
       ],
       'build_config': 'Debug',
@@ -400,7 +400,7 @@ FYI_WATERFALL = {
         {
           'gpu': '1002:6821',
           'hidpi': '1',
-          'os': 'Mac-10.11'
+          'os': 'Mac'
         },
       ],
       'build_config': 'Release',
@@ -408,6 +408,23 @@ FYI_WATERFALL = {
       'swarming': False,
       'os_type': 'mac',
     },
+    'Mac GPU ASAN Release': {
+      # This bot spawns jobs on multiple GPU types.
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0a2e',
+          'os': 'Mac-10.10'
+        },
+        {
+          'gpu': '1002:6821',
+          'hidpi': '1',
+          'os': 'Mac'
+        },
+      ],
+      'build_config': 'Release',
+      'swarming': True,
+      'os_type': 'mac',
+    },
     'Linux Release (NVIDIA)': {
       'swarming_dimensions': [
         {
@@ -651,7 +668,7 @@ FYI_WATERFALL = {
         {
           'gpu': '1002:6821',
           'hidpi': '1',
-          'os': 'Mac-10.10'
+          'os': 'Mac'
         },
       ],
       'build_config': 'Release',