Re-generate GPU bot json.

testing/buildbot/chromium.gpu.fyi.json

 {
   "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
   "AAAAA2 See generate_buildbot_json.py to make changes": {},
   "Android Release (NVIDIA Shield)": {
     "gtest_tests": [
       {
         "override_isolate_target": "angle_end2end_tests",
         "swarming": {
           "can_use_on_swarming_builders": false,
           "cipd_packages": [
@@ skipping 2546 matching lines @@
         "use_xvfb": false
       }
     ],
     "isolated_scripts": [
       {
         "args": [
           "context_lost",
           "--show-stdout",
           "--browser=debug",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
-        ],
-        "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_gl_passthrough_tests",
-        "override_compile_targets": [
-          "telemetry_gpu_integration_test_run"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": false,
-          "dimension_sets": [
-            {
-              "gpu": "8086:1912",
-              "os": "Ubuntu"
-            }
-          ]
-        }
-      },
-      {
-        "args": [
-          "webgl_conformance",
-          "--show-stdout",
-          "--browser=debug",
-          "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "name": "context_lost_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
@@ skipping 215 matching lines @@
           "--browser=debug",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "name": "webgl_conformance_gl_passthrough_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
-          "can_use_on_swarming_builders": true,
+          "can_use_on_swarming_builders": false,
           "dimension_sets": [
             {
-              "gpu": "10de:104a",
+              "gpu": "8086:1912",
               "os": "Ubuntu"
             }
           ]
         }
       },
       {
         "args": [
           "webgl_conformance",
           "--show-stdout",
           "--browser=debug",
@@ skipping 358 matching lines @@
             }
           ]
         }
       },
       {
         "args": [
           "webgl_conformance",
           "--show-stdout",
           "--browser=debug",
           "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "webgl_conformance_gl_passthrough_tests",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        }
+      },
+      {
+        "args": [
+          "webgl_conformance",
+          "--show-stdout",
+          "--browser=debug",
+          "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "name": "webgl_conformance_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ skipping 186 matching lines @@
         "name": "angle_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "gpu": "10de:104a",
               "os": "Ubuntu"
             }
           ]
         }
+      },
+      {
+        "args": [
+          "webgl_conformance",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "webgl_conformance_gl_passthrough_tests",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        }
       }
     ]
   },
   "Linux Release (AMD R5 230)": {
     "gtest_tests": [
       {
         "args": [
           "--use-gpu-in-tests",
           "--test-launcher-retry-limit=0"
         ],
@@ skipping 117 matching lines @@
         "use_xvfb": false
       }
     ],
     "isolated_scripts": [
       {
         "args": [
           "context_lost",
           "--show-stdout",
           "--browser=release",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
-        ],
-        "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_gl_passthrough_tests",
-        "override_compile_targets": [
-          "telemetry_gpu_integration_test_run"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": false,
-          "dimension_sets": [
-            {
-              "gpu": "1002:6779",
-              "os": "Ubuntu"
-            }
-          ]
-        }
-      },
-      {
-        "args": [
-          "webgl_conformance",
-          "--show-stdout",
-          "--browser=release",
-          "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "name": "context_lost_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
@@ skipping 49 matching lines @@
             }
           ]
         }
       },
       {
         "args": [
           "hardware_accelerated_feature",
           "--show-stdout",
           "--browser=release",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
-        ],
-        "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_gl_passthrough_tests",
-        "override_compile_targets": [
-          "telemetry_gpu_integration_test_run"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": false,
-          "dimension_sets": [
-            {
-              "gpu": "1002:6613",
-              "os": "Ubuntu"
-            }
-          ]
-        }
-      },
-      {
-        "args": [
-          "webgl_conformance",
-          "--show-stdout",
-          "--browser=release",
-          "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "name": "hardware_accelerated_feature_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
@@ skipping 164 matching lines @@
             }
           ]
         }
       },
       {
         "args": [
           "webgl_conformance",
           "--show-stdout",
           "--browser=release",
           "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "webgl_conformance_gl_passthrough_tests",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": false,
+          "dimension_sets": [
+            {
+              "gpu": "1002:6779",
+              "os": "Ubuntu"
+            }
+          ]
+        }
+      },
+      {
+        "args": [
+          "webgl_conformance",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "name": "webgl_conformance_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
@@ skipping 202 matching lines @@
             }
           ]
         }
       },
       {
         "args": [
           "hardware_accelerated_feature",
           "--show-stdout",
           "--browser=release",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
-        ],
-        "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_gl_passthrough_tests",
-        "override_compile_targets": [
-          "telemetry_gpu_integration_test_run"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": false,
-          "dimension_sets": [
-            {
-              "gpu": "8086:041a",
-              "os": "Ubuntu"
-            }
-          ]
-        }
-      },
-      {
-        "args": [
-          "webgl_conformance",
-          "--show-stdout",
-          "--browser=release",
-          "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "name": "hardware_accelerated_feature_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
@@ skipping 164 matching lines @@
             }
           ]
         }
       },
       {
         "args": [
           "webgl_conformance",
           "--show-stdout",
           "--browser=release",
           "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "webgl_conformance_gl_passthrough_tests",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": false,
+          "dimension_sets": [
+            {
+              "gpu": "1002:6613",
+              "os": "Ubuntu"
+            }
+          ]
+        }
+      },
+      {
+        "args": [
+          "webgl_conformance",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "name": "webgl_conformance_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
@@ skipping 291 matching lines @@
             }
           ]
         }
       },
       {
         "args": [
           "screenshot_sync",
           "--show-stdout",
           "--browser=release",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_gl_passthrough_tests",
+        "name": "screenshot_sync_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
             {
-              "gpu": "8086:1912",
+              "gpu": "8086:041a",
               "os": "Ubuntu"
             }
           ]
         }
       },
       {
         "args": [
-          "webgl_conformance",
+          "trace_test",
           "--show-stdout",
           "--browser=release",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "screenshot_sync_tests",
+        "name": "trace_test",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
             {
               "gpu": "8086:041a",
               "os": "Ubuntu"
             }
           ]
         }
       },
       {
         "args": [
-          "trace_test",
+          "webgl_conformance",
           "--show-stdout",
           "--browser=release",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
+          "--webgl-conformance-version=2.0.1",
+          "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "trace_test",
+        "name": "webgl2_conformance_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
             {
               "gpu": "8086:041a",
               "os": "Ubuntu"
             }
-          ]
+          ],
+          "shards": 15
         }
       },
       {
         "args": [
           "webgl_conformance",
           "--show-stdout",
           "--browser=release",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-          "--webgl-conformance-version=2.0.1",
-          "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl2_conformance_tests",
+        "name": "webgl_conformance_angle_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
             {
               "gpu": "8086:041a",
               "os": "Ubuntu"
             }
-          ],
-          "shards": 15
+          ]
         }
       },
       {
         "args": [
           "webgl_conformance",
           "--show-stdout",
           "--browser=release",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle"
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_angle_tests",
+        "name": "webgl_conformance_gl_passthrough_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
             {
               "gpu": "8086:041a",
               "os": "Ubuntu"
             }
@@ skipping 310 matching lines @@
             }
           ]
         }
       },
       {
         "args": [
           "screenshot_sync",
           "--show-stdout",
           "--browser=release",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_gl_passthrough_tests",
+        "name": "screenshot_sync_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
             {
-              "gpu": "10de:0f02",
+              "gpu": "8086:1912",
               "os": "Ubuntu"
             }
           ]
         }
       },
       {
         "args": [
-          "webgl_conformance",
+          "trace_test",
           "--show-stdout",
           "--browser=release",
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "screenshot_sync_tests",
+        "name": "trace_test",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
             {
               "gpu": "8086:1912",
               "os": "Ubuntu"
             }
           ]
         }
       },
       {
         "args": [
-          "trace_test",
+          "webgl_conformance",
           "--show-stdout",
           "--browser=release",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle",
+          "--webgl-conformance-version=2.0.1",
+          "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "trace_test",
+        "name": "webgl2_conformance_angle_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
             {
               "gpu": "8086:1912",
               "os": "Ubuntu"
             }
-          ]
+          ],
+          "shards": 15
         }
       },
       {
         "args": [
           "webgl_conformance",
           "--show-stdout",
           "--browser=release",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
           "--webgl-conformance-version=2.0.1",
           "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl2_conformance_angle_tests",
+        "name": "webgl2_conformance_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
             {
               "gpu": "8086:1912",
               "os": "Ubuntu"
             }
           ],
           "shards": 15
         }
       },
       {
         "args": [
           "webgl_conformance",
           "--show-stdout",
           "--browser=release",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-          "--webgl-conformance-version=2.0.1",
-          "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl2_conformance_tests",
+        "name": "webgl_conformance_angle_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
             {
               "gpu": "8086:1912",
               "os": "Ubuntu"
             }
-          ],
-          "shards": 15
+          ]
         }
       },
       {
         "args": [
           "webgl_conformance",
           "--show-stdout",
           "--browser=release",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle"
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_angle_tests",
+        "name": "webgl_conformance_gl_passthrough_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
             {
               "gpu": "8086:1912",
               "os": "Ubuntu"
             }
@@ skipping 333 matching lines @@
             }
           ]
         }
       },
       {
         "args": [
           "trace_test",
           "--show-stdout",
           "--browser=release",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_gl_passthrough_tests",
+        "name": "trace_test",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
-          "can_use_on_swarming_builders": true,
+          "can_use_on_swarming_builders": false,
           "dimension_sets": [
             {
-              "gpu": "10de:104a",
+              "gpu": "10de:0f02",
               "os": "Ubuntu"
             }
           ]
         }
       },
       {
         "args": [
           "webgl_conformance",
           "--show-stdout",
           "--browser=release",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
+          "--webgl-conformance-version=2.0.1",
+          "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "trace_test",
+        "name": "webgl2_conformance_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
             {
               "gpu": "10de:0f02",
               "os": "Ubuntu"
             }
-          ]
+          ],
+          "shards": 15
         }
       },
       {
         "args": [
           "webgl_conformance",
           "--show-stdout",
           "--browser=release",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-          "--webgl-conformance-version=2.0.1",
-          "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl2_conformance_tests",
+        "name": "webgl_conformance_angle_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
             {
               "gpu": "10de:0f02",
               "os": "Ubuntu"
             }
-          ],
-          "shards": 15
+          ]
         }
       },
       {
         "args": [
           "webgl_conformance",
           "--show-stdout",
           "--browser=release",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle"
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_angle_tests",
+        "name": "webgl_conformance_gl_passthrough_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false,
           "dimension_sets": [
             {
               "gpu": "10de:0f02",
               "os": "Ubuntu"
             }
@@ skipping 507 matching lines @@
             }
           ]
         }
       },
       {
         "args": [
           "webgl_conformance",
           "--show-stdout",
           "--browser=release",
           "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "webgl_conformance_gl_passthrough_tests",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        }
+      },
+      {
+        "args": [
+          "webgl_conformance",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "name": "webgl_conformance_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ skipping 3861 matching lines @@
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "gpu": "1002:6821",
               "hidpi": "1",
               "os": "Mac"
             }
           ]
         }
-      },
-      {
-        "args": [
-          "webgl_conformance",
-          "--show-stdout",
-          "--browser=release",
-          "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
-        ],
-        "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_gl_passthrough_tests",
-        "override_compile_targets": [
-          "telemetry_gpu_integration_test_run"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "gpu": "10de:104a",
-              "os": "Ubuntu"
-            }
-          ]
-        }
       }
     ]
   },
   "Mac Retina Release (NVIDIA)": {
     "gtest_tests": [
       {
         "args": [
           "--use-gpu-in-tests",
           "--test-launcher-retry-limit=0"
         ],
@@ skipping 524 matching lines @@
         ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "gpu": "10de:104a",
               "os": "Ubuntu"
             }
           ]
         }
+      },
+      {
+        "args": [
+          "webgl_conformance",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "webgl_conformance_gl_passthrough_tests",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        }
       }
     ]
   },
   "Optional Mac 10.10 Release (Intel)": {
     "gtest_tests": [
       {
         "args": [
           "--use-gpu-in-tests",
           "--test-launcher-retry-limit=0"
         ],
@@ skipping 8162 matching lines @@
             {
               "gpu": "10de:104a",
               "os": "Windows-2008ServerR2-SP1"
             }
           ]
         }
       }
     ]
   }
 }