| Index: testing/buildbot/chromium.gpu.fyi.json | 
| diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json | 
| index b0c8df99bdc420caf5122d6e2f9984b3252202b6..35e3fe9c79280edd05c21bd55b60879400a6aa98 100644 | 
| --- a/testing/buildbot/chromium.gpu.fyi.json | 
| +++ b/testing/buildbot/chromium.gpu.fyi.json | 
| @@ -7285,7 +7285,7 @@ | 
| } | 
| ] | 
| }, | 
| -  "Mac Retina Debug": { | 
| +  "Mac 10.11 Retina Release (AMD)": { | 
| "gtest_tests": [ | 
| { | 
| "args": [ | 
| @@ -7295,9 +7295,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "10de:0fe9", | 
| +              "gpu": "1002:6821", | 
| "hidpi": "1", | 
| -              "os": "Mac" | 
| +              "os": "Mac-10.11" | 
| } | 
| ] | 
| }, | 
| @@ -7312,9 +7312,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "10de:0fe9", | 
| +              "gpu": "1002:6821", | 
| "hidpi": "1", | 
| -              "os": "Mac" | 
| +              "os": "Mac-10.11" | 
| } | 
| ] | 
| }, | 
| @@ -7329,9 +7329,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "10de:0fe9", | 
| +              "gpu": "1002:6821", | 
| "hidpi": "1", | 
| -              "os": "Mac" | 
| +              "os": "Mac-10.11" | 
| } | 
| ] | 
| }, | 
| @@ -7340,15 +7340,25 @@ | 
| }, | 
| { | 
| "args": [ | 
| +          "--enable-gpu", | 
| +          "--test-launcher-jobs=1", | 
| +          "--gtest_filter=CastStreamingApiTestWithPixelOutput.EndToEnd*:TabCaptureApiPixelTest.EndToEnd*" | 
| +        ], | 
| +        "name": "tab_capture_end2end_tests", | 
| +        "test": "browser_tests", | 
| +        "use_xvfb": false | 
| +      }, | 
| +      { | 
| +        "args": [ | 
| "--use-gpu-in-tests" | 
| ], | 
| "swarming": { | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "10de:0fe9", | 
| +              "gpu": "1002:6821", | 
| "hidpi": "1", | 
| -              "os": "Mac" | 
| +              "os": "Mac-10.11" | 
| } | 
| ] | 
| }, | 
| @@ -7363,9 +7373,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "10de:0fe9", | 
| +              "gpu": "1002:6821", | 
| "hidpi": "1", | 
| -              "os": "Mac" | 
| +              "os": "Mac-10.11" | 
| } | 
| ] | 
| }, | 
| @@ -7380,9 +7390,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "10de:0fe9", | 
| +              "gpu": "1002:6821", | 
| "hidpi": "1", | 
| -              "os": "Mac" | 
| +              "os": "Mac-10.11" | 
| } | 
| ] | 
| }, | 
| @@ -7395,7 +7405,7 @@ | 
| "args": [ | 
| "context_lost", | 
| "--show-stdout", | 
| -          "--browser=debug", | 
| +          "--browser=release", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" | 
| ], | 
| @@ -7408,9 +7418,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "10de:0fe9", | 
| +              "gpu": "1002:6821", | 
| "hidpi": "1", | 
| -              "os": "Mac" | 
| +              "os": "Mac-10.11" | 
| } | 
| ] | 
| } | 
| @@ -7419,7 +7429,7 @@ | 
| "args": [ | 
| "gpu_process", | 
| "--show-stdout", | 
| -          "--browser=debug", | 
| +          "--browser=release", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" | 
| ], | 
| @@ -7432,9 +7442,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "10de:0fe9", | 
| +              "gpu": "1002:6821", | 
| "hidpi": "1", | 
| -              "os": "Mac" | 
| +              "os": "Mac-10.11" | 
| } | 
| ] | 
| } | 
| @@ -7443,7 +7453,7 @@ | 
| "args": [ | 
| "gpu_rasterization", | 
| "--show-stdout", | 
| -          "--browser=debug", | 
| +          "--browser=release", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" | 
| ], | 
| @@ -7456,9 +7466,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "10de:0fe9", | 
| +              "gpu": "1002:6821", | 
| "hidpi": "1", | 
| -              "os": "Mac" | 
| +              "os": "Mac-10.11" | 
| } | 
| ] | 
| } | 
| @@ -7467,7 +7477,7 @@ | 
| "args": [ | 
| "hardware_accelerated_feature", | 
| "--show-stdout", | 
| -          "--browser=debug", | 
| +          "--browser=release", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" | 
| ], | 
| @@ -7480,9 +7490,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "10de:0fe9", | 
| +              "gpu": "1002:6821", | 
| "hidpi": "1", | 
| -              "os": "Mac" | 
| +              "os": "Mac-10.11" | 
| } | 
| ] | 
| } | 
| @@ -7491,7 +7501,7 @@ | 
| "args": [ | 
| "maps", | 
| "--show-stdout", | 
| -          "--browser=debug", | 
| +          "--browser=release", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc", | 
| "--os-type", | 
| @@ -7510,9 +7520,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "10de:0fe9", | 
| +              "gpu": "1002:6821", | 
| "hidpi": "1", | 
| -              "os": "Mac" | 
| +              "os": "Mac-10.11" | 
| } | 
| ] | 
| } | 
| @@ -7521,7 +7531,7 @@ | 
| "args": [ | 
| "pixel", | 
| "--show-stdout", | 
| -          "--browser=debug", | 
| +          "--browser=release", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc", | 
| "--refimg-cloud-storage-bucket", | 
| @@ -7548,9 +7558,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "10de:0fe9", | 
| +              "gpu": "1002:6821", | 
| "hidpi": "1", | 
| -              "os": "Mac" | 
| +              "os": "Mac-10.11" | 
| } | 
| ] | 
| } | 
| @@ -7559,7 +7569,7 @@ | 
| "args": [ | 
| "screenshot_sync", | 
| "--show-stdout", | 
| -          "--browser=debug", | 
| +          "--browser=release", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" | 
| ], | 
| @@ -7572,9 +7582,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "10de:0fe9", | 
| +              "gpu": "1002:6821", | 
| "hidpi": "1", | 
| -              "os": "Mac" | 
| +              "os": "Mac-10.11" | 
| } | 
| ] | 
| } | 
| @@ -7583,7 +7593,7 @@ | 
| "args": [ | 
| "trace_test", | 
| "--show-stdout", | 
| -          "--browser=debug", | 
| +          "--browser=release", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" | 
| ], | 
| @@ -7596,9 +7606,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "10de:0fe9", | 
| +              "gpu": "1002:6821", | 
| "hidpi": "1", | 
| -              "os": "Mac" | 
| +              "os": "Mac-10.11" | 
| } | 
| ] | 
| } | 
| @@ -7607,7 +7617,34 @@ | 
| "args": [ | 
| "webgl_conformance", | 
| "--show-stdout", | 
| -          "--browser=debug", | 
| +          "--browser=release", | 
| +          "-v", | 
| +          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc", | 
| +          "--webgl-conformance-version=2.0.0", | 
| +          "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json" | 
| +        ], | 
| +        "isolate_name": "telemetry_gpu_integration_test", | 
| +        "name": "webgl2_conformance_tests", | 
| +        "override_compile_targets": [ | 
| +          "telemetry_gpu_integration_test_run" | 
| +        ], | 
| +        "swarming": { | 
| +          "can_use_on_swarming_builders": true, | 
| +          "dimension_sets": [ | 
| +            { | 
| +              "gpu": "1002:6821", | 
| +              "hidpi": "1", | 
| +              "os": "Mac-10.11" | 
| +            } | 
| +          ], | 
| +          "shards": 15 | 
| +        } | 
| +      }, | 
| +      { | 
| +        "args": [ | 
| +          "webgl_conformance", | 
| +          "--show-stdout", | 
| +          "--browser=release", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" | 
| ], | 
| @@ -7620,16 +7657,16 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "10de:0fe9", | 
| +              "gpu": "1002:6821", | 
| "hidpi": "1", | 
| -              "os": "Mac" | 
| +              "os": "Mac-10.11" | 
| } | 
| ] | 
| } | 
| } | 
| ] | 
| }, | 
| -  "Mac Retina Release": { | 
| +  "Mac Retina Debug": { | 
| "gtest_tests": [ | 
| { | 
| "args": [ | 
| @@ -7732,23 +7769,6 @@ | 
| }, | 
| "test": "gles2_conform_test", | 
| "use_xvfb": false | 
| -      }, | 
| -      { | 
| -        "override_compile_targets": [ | 
| -          "tab_capture_end2end_tests_run" | 
| -        ], | 
| -        "swarming": { | 
| -          "can_use_on_swarming_builders": true, | 
| -          "dimension_sets": [ | 
| -            { | 
| -              "gpu": "10de:0fe9", | 
| -              "hidpi": "1", | 
| -              "os": "Mac" | 
| -            } | 
| -          ] | 
| -        }, | 
| -        "test": "tab_capture_end2end_tests", | 
| -        "use_xvfb": false | 
| } | 
| ], | 
| "isolated_scripts": [ | 
| @@ -7756,7 +7776,7 @@ | 
| "args": [ | 
| "context_lost", | 
| "--show-stdout", | 
| -          "--browser=release", | 
| +          "--browser=debug", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" | 
| ], | 
| @@ -7780,7 +7800,7 @@ | 
| "args": [ | 
| "gpu_process", | 
| "--show-stdout", | 
| -          "--browser=release", | 
| +          "--browser=debug", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" | 
| ], | 
| @@ -7804,7 +7824,7 @@ | 
| "args": [ | 
| "gpu_rasterization", | 
| "--show-stdout", | 
| -          "--browser=release", | 
| +          "--browser=debug", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" | 
| ], | 
| @@ -7828,7 +7848,7 @@ | 
| "args": [ | 
| "hardware_accelerated_feature", | 
| "--show-stdout", | 
| -          "--browser=release", | 
| +          "--browser=debug", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" | 
| ], | 
| @@ -7852,7 +7872,7 @@ | 
| "args": [ | 
| "maps", | 
| "--show-stdout", | 
| -          "--browser=release", | 
| +          "--browser=debug", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc", | 
| "--os-type", | 
| @@ -7882,7 +7902,7 @@ | 
| "args": [ | 
| "pixel", | 
| "--show-stdout", | 
| -          "--browser=release", | 
| +          "--browser=debug", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc", | 
| "--refimg-cloud-storage-bucket", | 
| @@ -7920,7 +7940,7 @@ | 
| "args": [ | 
| "screenshot_sync", | 
| "--show-stdout", | 
| -          "--browser=release", | 
| +          "--browser=debug", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" | 
| ], | 
| @@ -7944,7 +7964,7 @@ | 
| "args": [ | 
| "trace_test", | 
| "--show-stdout", | 
| -          "--browser=release", | 
| +          "--browser=debug", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" | 
| ], | 
| @@ -7968,34 +7988,7 @@ | 
| "args": [ | 
| "webgl_conformance", | 
| "--show-stdout", | 
| -          "--browser=release", | 
| -          "-v", | 
| -          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc", | 
| -          "--webgl-conformance-version=2.0.0", | 
| -          "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json" | 
| -        ], | 
| -        "isolate_name": "telemetry_gpu_integration_test", | 
| -        "name": "webgl2_conformance_tests", | 
| -        "override_compile_targets": [ | 
| -          "telemetry_gpu_integration_test_run" | 
| -        ], | 
| -        "swarming": { | 
| -          "can_use_on_swarming_builders": true, | 
| -          "dimension_sets": [ | 
| -            { | 
| -              "gpu": "10de:0fe9", | 
| -              "hidpi": "1", | 
| -              "os": "Mac" | 
| -            } | 
| -          ], | 
| -          "shards": 15 | 
| -        } | 
| -      }, | 
| -      { | 
| -        "args": [ | 
| -          "webgl_conformance", | 
| -          "--show-stdout", | 
| -          "--browser=release", | 
| +          "--browser=debug", | 
| "-v", | 
| "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" | 
| ], | 
| @@ -8017,7 +8010,7 @@ | 
| } | 
| ] | 
| }, | 
| -  "Mac Retina Release (AMD)": { | 
| +  "Mac Retina Release": { | 
| "gtest_tests": [ | 
| { | 
| "args": [ | 
| @@ -8027,9 +8020,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "1002:6821", | 
| +              "gpu": "10de:0fe9", | 
| "hidpi": "1", | 
| -              "os": "Mac-10.11" | 
| +              "os": "Mac" | 
| } | 
| ] | 
| }, | 
| @@ -8044,9 +8037,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "1002:6821", | 
| +              "gpu": "10de:0fe9", | 
| "hidpi": "1", | 
| -              "os": "Mac-10.11" | 
| +              "os": "Mac" | 
| } | 
| ] | 
| }, | 
| @@ -8061,9 +8054,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "1002:6821", | 
| +              "gpu": "10de:0fe9", | 
| "hidpi": "1", | 
| -              "os": "Mac-10.11" | 
| +              "os": "Mac" | 
| } | 
| ] | 
| }, | 
| @@ -8072,25 +8065,15 @@ | 
| }, | 
| { | 
| "args": [ | 
| -          "--enable-gpu", | 
| -          "--test-launcher-jobs=1", | 
| -          "--gtest_filter=CastStreamingApiTestWithPixelOutput.EndToEnd*:TabCaptureApiPixelTest.EndToEnd*" | 
| -        ], | 
| -        "name": "tab_capture_end2end_tests", | 
| -        "test": "browser_tests", | 
| -        "use_xvfb": false | 
| -      }, | 
| -      { | 
| -        "args": [ | 
| "--use-gpu-in-tests" | 
| ], | 
| "swarming": { | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "1002:6821", | 
| +              "gpu": "10de:0fe9", | 
| "hidpi": "1", | 
| -              "os": "Mac-10.11" | 
| +              "os": "Mac" | 
| } | 
| ] | 
| }, | 
| @@ -8105,9 +8088,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "1002:6821", | 
| +              "gpu": "10de:0fe9", | 
| "hidpi": "1", | 
| -              "os": "Mac-10.11" | 
| +              "os": "Mac" | 
| } | 
| ] | 
| }, | 
| @@ -8122,14 +8105,31 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "1002:6821", | 
| +              "gpu": "10de:0fe9", | 
| "hidpi": "1", | 
| -              "os": "Mac-10.11" | 
| +              "os": "Mac" | 
| } | 
| ] | 
| }, | 
| "test": "gles2_conform_test", | 
| "use_xvfb": false | 
| +      }, | 
| +      { | 
| +        "override_compile_targets": [ | 
| +          "tab_capture_end2end_tests_run" | 
| +        ], | 
| +        "swarming": { | 
| +          "can_use_on_swarming_builders": true, | 
| +          "dimension_sets": [ | 
| +            { | 
| +              "gpu": "10de:0fe9", | 
| +              "hidpi": "1", | 
| +              "os": "Mac" | 
| +            } | 
| +          ] | 
| +        }, | 
| +        "test": "tab_capture_end2end_tests", | 
| +        "use_xvfb": false | 
| } | 
| ], | 
| "isolated_scripts": [ | 
| @@ -8150,9 +8150,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "1002:6821", | 
| +              "gpu": "10de:0fe9", | 
| "hidpi": "1", | 
| -              "os": "Mac-10.11" | 
| +              "os": "Mac" | 
| } | 
| ] | 
| } | 
| @@ -8174,9 +8174,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "1002:6821", | 
| +              "gpu": "10de:0fe9", | 
| "hidpi": "1", | 
| -              "os": "Mac-10.11" | 
| +              "os": "Mac" | 
| } | 
| ] | 
| } | 
| @@ -8198,9 +8198,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "1002:6821", | 
| +              "gpu": "10de:0fe9", | 
| "hidpi": "1", | 
| -              "os": "Mac-10.11" | 
| +              "os": "Mac" | 
| } | 
| ] | 
| } | 
| @@ -8222,9 +8222,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "1002:6821", | 
| +              "gpu": "10de:0fe9", | 
| "hidpi": "1", | 
| -              "os": "Mac-10.11" | 
| +              "os": "Mac" | 
| } | 
| ] | 
| } | 
| @@ -8252,9 +8252,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "1002:6821", | 
| +              "gpu": "10de:0fe9", | 
| "hidpi": "1", | 
| -              "os": "Mac-10.11" | 
| +              "os": "Mac" | 
| } | 
| ] | 
| } | 
| @@ -8290,9 +8290,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "1002:6821", | 
| +              "gpu": "10de:0fe9", | 
| "hidpi": "1", | 
| -              "os": "Mac-10.11" | 
| +              "os": "Mac" | 
| } | 
| ] | 
| } | 
| @@ -8314,9 +8314,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "1002:6821", | 
| +              "gpu": "10de:0fe9", | 
| "hidpi": "1", | 
| -              "os": "Mac-10.11" | 
| +              "os": "Mac" | 
| } | 
| ] | 
| } | 
| @@ -8338,9 +8338,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "1002:6821", | 
| +              "gpu": "10de:0fe9", | 
| "hidpi": "1", | 
| -              "os": "Mac-10.11" | 
| +              "os": "Mac" | 
| } | 
| ] | 
| } | 
| @@ -8364,9 +8364,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "1002:6821", | 
| +              "gpu": "10de:0fe9", | 
| "hidpi": "1", | 
| -              "os": "Mac-10.11" | 
| +              "os": "Mac" | 
| } | 
| ], | 
| "shards": 15 | 
| @@ -8389,9 +8389,9 @@ | 
| "can_use_on_swarming_builders": true, | 
| "dimension_sets": [ | 
| { | 
| -              "gpu": "1002:6821", | 
| +              "gpu": "10de:0fe9", | 
| "hidpi": "1", | 
| -              "os": "Mac-10.11" | 
| +              "os": "Mac" | 
| } | 
| ] | 
| } | 
|  |