Run the WebGL2 conformance GL tests against the passthrough cmd decoder.

ANGLE's GL backend will likely only be released in conjuction with the
passthrough command decoder.

TBR=kbr@chromium.org
BUG=693090

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I92df6a32eae8a8266454ab6312c2a3b56c2cf9e4
Reviewed-on: https://chromium-review.googlesource.com/984372
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552084}

content/test/gpu/generate_buildbot_json.py

@@ -2298,7 +2298,7 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
          # the Debug bots, which is too long.
         'build_configs': ['Release'],
         'predicate': Predicates.FYI_ONLY,
-        # Only run on the NVIDIA Release and Intel Release Linux bots.
+        # Run on the NVIDIA Release Windows/Linux and Intel Release Linux bots
         'swarming_dimension_sets': [
           {
             'gpu': LINUX_QUADRO_P400_STABLE_DRIVER,
@@ -2312,47 +2312,6 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
             'gpu': '8086:1912',
             'os': 'Ubuntu'
           },
-        ],
-        'disabled_instrumentation_types': ['tsan'],
-      },
-    ],
-    'disabled_tester_configs': [
-      {
-        'names': [
-          'Linux FYI Ozone (Intel)',
-        ],
-      },
-    ],
-    'target_name': 'webgl_conformance',
-    'extra_browser_args': [
-      '--use-gl=angle',
-      '--use-angle=gl',
-      '--use-cmd-decoder=passthrough',
-    ],
-    'args': [
-      '--webgl-conformance-version=2.0.1',
-      # The current working directory when run via isolate is
-      # out/Debug or out/Release. Reference this file relatively to
-      # it.
-      '--read-abbreviated-json-results-from=' + \
-      '../../content/test/data/gpu/webgl2_conformance_tests_output.json',
-    ],
-    'asan_args': ['--is-asan'],
-    'swarming': {
-      # These tests currently take about an hour and fifteen minutes
-      # to run serially.
-      'shards': 20,
-    },
-  },
-  'webgl2_conformance_gl_tests': {
-    'tester_configs': [
-      {
-         # The WebGL 2.0 conformance tests take over an hour to run on
-         # the Debug bots, which is too long.
-        'build_configs': ['Release'],
-        'predicate': Predicates.FYI_ONLY,
-        # Only run on the NVIDIA Release Windows bots.
-        'swarming_dimension_sets': [
           {
             'gpu': NVIDIA_QUADRO_P400_ALL_DRIVERS,
             'os': WIN10_NVIDIA_QUADRO_P400_STABLE_OS,
@@ -2370,8 +2329,9 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
     ],
     'target_name': 'webgl_conformance',
     'extra_browser_args': [
+      '--use-gl=angle',
       '--use-angle=gl',
-      '--use-cmd-decoder=validating',
+      '--use-cmd-decoder=passthrough',
     ],
     'args': [
       '--webgl-conformance-version=2.0.1',

testing/buildbot/chromium.gpu.fyi.json

@@ -14959,12 +14959,12 @@
           "--browser=release",
           "--passthrough",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-angle=gl --use-cmd-decoder=validating",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-cmd-decoder=passthrough",
           "--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_gl_tests",
+        "name": "webgl2_conformance_gl_passthrough_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test"
         ],