Update GPU ANGLE/SkRenderer tags

Updates the following GPU expectation tags:
1. angle-no-backend is now angle-disabled, as that is more accurate.
2. The Skia Renderer tags now use skia-renderer as a prefix instead of
   a suffix.

Bug: 1111876, 1011107
Change-Id: I3b8ee3175449e4e55eebdd78e575ac2ebcfeaf3a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2472903Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817273}

content/test/gpu/gpu_tests/gpu_helper.py

@@ -98,7 +98,7 @@ def GetGpuDriverVersion(gpu_info):
 
 
 def GetANGLERenderer(gpu_info):
-  retval = 'angle-no-backend'
+  retval = 'angle-disabled'
   if gpu_info and gpu_info.aux_attributes:
     gl_renderer = gpu_info.aux_attributes.get('gl_renderer')
     if gl_renderer and 'ANGLE' in gl_renderer:
@@ -139,17 +139,17 @@ def GetCommandDecoder(gpu_info):
 
 
 def GetSkiaRenderer(gpu_feature_status, extra_browser_args):
-  retval = 'no-skia-renderer'
+  retval = 'skia-renderer-disabled'
   skia_renderer_enabled = (
       gpu_feature_status
       and gpu_feature_status.get('skia_renderer') == 'enabled_on')
   if skia_renderer_enabled:
     if HasDawnSkiaRenderer(extra_browser_args):
-      retval = 'dawn-skia-renderer'
+      retval = 'skia-renderer-dawn'
     elif HasGlSkiaRenderer(extra_browser_args):
-      retval = 'gl-skia-renderer'
+      retval = 'skia-renderer-gl'
     elif HasVulkanSkiaRenderer(gpu_feature_status):
-      retval = 'vulkan-skia-renderer'
+      retval = 'skia-renderer-vulkan'
   return retval
 
 

content/test/gpu/gpu_tests/gpu_integration_test_unittest.py

@@ -202,7 +202,7 @@ class GpuIntegrationTestUnittest(unittest.TestCase):
         _GetTagsToTest(browser),
         set([
             'win', 'win10', 'release', 'nvidia', 'nvidia-0x1cb3', 'angle-d3d9',
-            'no-passthrough', 'no-swiftshader-gl', 'no-skia-renderer'
+            'no-passthrough', 'no-swiftshader-gl', 'skia-renderer-disabled'
         ]))
 
   def testGenerateVendorTagUsingVendorString(self):
@@ -218,7 +218,7 @@ class GpuIntegrationTestUnittest(unittest.TestCase):
         set([
             'mac', 'mojave', 'release', 'imagination',
             'imagination-PowerVR-SGX-554', 'angle-opengles', 'passthrough',
-            'no-swiftshader-gl', 'no-skia-renderer'
+            'no-swiftshader-gl', 'skia-renderer-disabled'
         ]))
 
   def testGenerateVendorTagUsingDeviceString(self):
@@ -231,8 +231,8 @@ class GpuIntegrationTestUnittest(unittest.TestCase):
         _GetTagsToTest(browser),
         set([
             'mac', 'mojave', 'release', 'imagination',
-            'imagination-Triangle-Monster-3000', 'angle-no-backend',
-            'no-passthrough', 'no-swiftshader-gl', 'no-skia-renderer'
+            'imagination-Triangle-Monster-3000', 'angle-disabled',
+            'no-passthrough', 'no-swiftshader-gl', 'skia-renderer-disabled'
         ]))
 
   def testSimpleIntegrationTest(self):

content/test/gpu/gpu_tests/test_expectations/context_lost_expectations.txt

@@ -30,17 +30,17 @@
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend
-# tags: [ angle-no-backend
+# tags: [ angle-disabled
 #         angle-d3d9 angle-d3d11
 #         angle-metal
 #         angle-opengl angle-opengles
 #         angle-swiftshader
 #         angle-vulkan ]
 # Skia Renderer
-# tags: [ dawn-skia-renderer
-#         gl-skia-renderer
-#         no-skia-renderer
-#         vulkan-skia-renderer ]
+# tags: [ skia-renderer-dawn
+#         skia-renderer-disabled
+#         skia-renderer-gl
+#         skia-renderer-vulkan ]
 # SwiftShader
 # tags: [ swiftshader-gl no-swiftshader-gl ]
 # Driver

content/test/gpu/gpu_tests/test_expectations/depth_capture_expectations.txt

@@ -30,17 +30,17 @@
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend
-# tags: [ angle-no-backend
+# tags: [ angle-disabled
 #         angle-d3d9 angle-d3d11
 #         angle-metal
 #         angle-opengl angle-opengles
 #         angle-swiftshader
 #         angle-vulkan ]
 # Skia Renderer
-# tags: [ dawn-skia-renderer
-#         gl-skia-renderer
-#         no-skia-renderer
-#         vulkan-skia-renderer ]
+# tags: [ skia-renderer-dawn
+#         skia-renderer-disabled
+#         skia-renderer-gl
+#         skia-renderer-vulkan ]
 # SwiftShader
 # tags: [ swiftshader-gl no-swiftshader-gl ]
 # Driver

content/test/gpu/gpu_tests/test_expectations/gpu_process_expectations.txt

@@ -30,17 +30,17 @@
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend
-# tags: [ angle-no-backend
+# tags: [ angle-disabled
 #         angle-d3d9 angle-d3d11
 #         angle-metal
 #         angle-opengl angle-opengles
 #         angle-swiftshader
 #         angle-vulkan ]
 # Skia Renderer
-# tags: [ dawn-skia-renderer
-#         gl-skia-renderer
-#         no-skia-renderer
-#         vulkan-skia-renderer ]
+# tags: [ skia-renderer-dawn
+#         skia-renderer-disabled
+#         skia-renderer-gl
+#         skia-renderer-vulkan ]
 # SwiftShader
 # tags: [ swiftshader-gl no-swiftshader-gl ]
 # Driver

content/test/gpu/gpu_tests/test_expectations/hardware_accelerated_feature_expectations.txt

@@ -30,17 +30,17 @@
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend
-# tags: [ angle-no-backend
+# tags: [ angle-disabled
 #         angle-d3d9 angle-d3d11
 #         angle-metal
 #         angle-opengl angle-opengles
 #         angle-swiftshader
 #         angle-vulkan ]
 # Skia Renderer
-# tags: [ dawn-skia-renderer
-#         gl-skia-renderer
-#         no-skia-renderer
-#         vulkan-skia-renderer ]
+# tags: [ skia-renderer-dawn
+#         skia-renderer-disabled
+#         skia-renderer-gl
+#         skia-renderer-vulkan ]
 # SwiftShader
 # tags: [ swiftshader-gl no-swiftshader-gl ]
 # Driver

content/test/gpu/gpu_tests/test_expectations/info_collection_expectations.txt

@@ -30,17 +30,17 @@
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend
-# tags: [ angle-no-backend
+# tags: [ angle-disabled
 #         angle-d3d9 angle-d3d11
 #         angle-metal
 #         angle-opengl angle-opengles
 #         angle-swiftshader
 #         angle-vulkan ]
 # Skia Renderer
-# tags: [ dawn-skia-renderer
-#         gl-skia-renderer
-#         no-skia-renderer
-#         vulkan-skia-renderer ]
+# tags: [ skia-renderer-dawn
+#         skia-renderer-disabled
+#         skia-renderer-gl
+#         skia-renderer-vulkan ]
 # SwiftShader
 # tags: [ swiftshader-gl no-swiftshader-gl ]
 # Driver

content/test/gpu/gpu_tests/test_expectations/maps_expectations.txt

@@ -30,17 +30,17 @@
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend
-# tags: [ angle-no-backend
+# tags: [ angle-disabled
 #         angle-d3d9 angle-d3d11
 #         angle-metal
 #         angle-opengl angle-opengles
 #         angle-swiftshader
 #         angle-vulkan ]
 # Skia Renderer
-# tags: [ dawn-skia-renderer
-#         gl-skia-renderer
-#         no-skia-renderer
-#         vulkan-skia-renderer ]
+# tags: [ skia-renderer-dawn
+#         skia-renderer-disabled
+#         skia-renderer-gl
+#         skia-renderer-vulkan ]
 # SwiftShader
 # tags: [ swiftshader-gl no-swiftshader-gl ]
 # Driver

content/test/gpu/gpu_tests/test_expectations/power_measurement_expectations.txt

@@ -30,17 +30,17 @@
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend
-# tags: [ angle-no-backend
+# tags: [ angle-disabled
 #         angle-d3d9 angle-d3d11
 #         angle-metal
 #         angle-opengl angle-opengles
 #         angle-swiftshader
 #         angle-vulkan ]
 # Skia Renderer
-# tags: [ dawn-skia-renderer
-#         gl-skia-renderer
-#         no-skia-renderer
-#         vulkan-skia-renderer ]
+# tags: [ skia-renderer-dawn
+#         skia-renderer-disabled
+#         skia-renderer-gl
+#         skia-renderer-vulkan ]
 # SwiftShader
 # tags: [ swiftshader-gl no-swiftshader-gl ]
 # Driver

content/test/gpu/gpu_tests/test_expectations/screenshot_sync_expectations.txt

@@ -30,17 +30,17 @@
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend
-# tags: [ angle-no-backend
+# tags: [ angle-disabled
 #         angle-d3d9 angle-d3d11
 #         angle-metal
 #         angle-opengl angle-opengles
 #         angle-swiftshader
 #         angle-vulkan ]
 # Skia Renderer
-# tags: [ dawn-skia-renderer
-#         gl-skia-renderer
-#         no-skia-renderer
-#         vulkan-skia-renderer ]
+# tags: [ skia-renderer-dawn
+#         skia-renderer-disabled
+#         skia-renderer-gl
+#         skia-renderer-vulkan ]
 # SwiftShader
 # tags: [ swiftshader-gl no-swiftshader-gl ]
 # Driver
@@ -70,7 +70,7 @@ crbug.com/648369 [ linux debug intel ] * [ RetryOnFailure ]
 # Flakily getting a WebSocketException on Windows w/ Intel UHD 630
 crbug.com/986939 [ win intel-0x3e92 ] ScreenshotSync_GPURasterWithCanvas [ RetryOnFailure ]
 
-crbug.com/1006045 [ android android-nexus-5x gl-skia-renderer ] ScreenshotSync_GPURasterWithCanvas [ Failure ]
-crbug.com/1006045 [ android android-nexus-5x gl-skia-renderer ] ScreenshotSync_GPURasterWithDivs [ Failure ]
-crbug.com/1006045 [ android android-nexus-5x gl-skia-renderer ] ScreenshotSync_SWRasterWithCanvas [ Failure ]
-crbug.com/1006045 [ android android-nexus-5x gl-skia-renderer ] ScreenshotSync_SWRasterWithDivs [ Failure ]
+crbug.com/1006045 [ android android-nexus-5x skia-renderer-gl ] ScreenshotSync_GPURasterWithCanvas [ Failure ]
+crbug.com/1006045 [ android android-nexus-5x skia-renderer-gl ] ScreenshotSync_GPURasterWithDivs [ Failure ]
+crbug.com/1006045 [ android android-nexus-5x skia-renderer-gl ] ScreenshotSync_SWRasterWithCanvas [ Failure ]
+crbug.com/1006045 [ android android-nexus-5x skia-renderer-gl ] ScreenshotSync_SWRasterWithDivs [ Failure ]

content/test/gpu/gpu_tests/test_expectations/trace_test_expectations.txt

@@ -30,17 +30,17 @@
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend
-# tags: [ angle-no-backend
+# tags: [ angle-disabled
 #         angle-d3d9 angle-d3d11
 #         angle-metal
 #         angle-opengl angle-opengles
 #         angle-swiftshader
 #         angle-vulkan ]
 # Skia Renderer
-# tags: [ dawn-skia-renderer
-#         gl-skia-renderer
-#         no-skia-renderer
-#         vulkan-skia-renderer ]
+# tags: [ skia-renderer-dawn
+#         skia-renderer-disabled
+#         skia-renderer-gl
+#         skia-renderer-vulkan ]
 # SwiftShader
 # tags: [ swiftshader-gl no-swiftshader-gl ]
 # Driver

content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt

@@ -30,17 +30,17 @@
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend
-# tags: [ angle-no-backend
+# tags: [ angle-disabled
 #         angle-d3d9 angle-d3d11
 #         angle-metal
 #         angle-opengl angle-opengles
 #         angle-swiftshader
 #         angle-vulkan ]
 # Skia Renderer
-# tags: [ dawn-skia-renderer
-#         gl-skia-renderer
-#         no-skia-renderer
-#         vulkan-skia-renderer ]
+# tags: [ skia-renderer-dawn
+#         skia-renderer-disabled
+#         skia-renderer-gl
+#         skia-renderer-vulkan ]
 # SwiftShader
 # tags: [ swiftshader-gl no-swiftshader-gl ]
 # Driver
@@ -157,7 +157,7 @@ crbug.com/979444 [ chromeos ] conformance/textures/misc/texture-corner-case-vide
 crbug.com/979444 [ linux ] conformance/textures/misc/texture-corner-case-videos.html [ RetryOnFailure ]
 crbug.com/979444 [ mac no-asan no-passthrough ] conformance/textures/misc/texture-corner-case-videos.html [ RetryOnFailure ]
 crbug.com/979444 [ win ] conformance/textures/misc/texture-corner-case-videos.html [ RetryOnFailure ]
-crbug.com/979444 [ android angle-no-backend ] conformance/textures/misc/texture-corner-case-videos.html [ RetryOnFailure ]
+crbug.com/979444 [ android angle-disabled ] conformance/textures/misc/texture-corner-case-videos.html [ RetryOnFailure ]
 
 # Nvidia bugs fixed in latest driver
 # TODO(http://crbug.com/887241): Upgrade the drivers on the bots.
@@ -377,7 +377,7 @@ crbug.com/angleproject/4242 [ mac ] conformance2/glsl3/matrix-row-major-dynamic-
 crbug.com/angleproject/4417 [ mac no-passthrough ] conformance2/rendering/framebuffer-render-to-layer.html [ Failure ]
 
 # Flakes heavily on many OpenGL configurations
-crbug.com/832238 [ mac angle-no-backend ] conformance2/transform_feedback/too-small-buffers.html [ Failure ]
+crbug.com/832238 [ mac angle-disabled ] conformance2/transform_feedback/too-small-buffers.html [ Failure ]
 
 # Regressions in 10.12.4.
 crbug.com/705865 [ sierra intel ] conformance2/textures/misc/tex-base-level-bug.html [ Failure ]
@@ -426,7 +426,7 @@ crbug.com/483282 [ mac nvidia-0xfe9 ] conformance/programs/gl-bind-attrib-locati
 crbug.com/483282 [ mac nvidia-0xfe9 no-passthrough ] conformance2/glsl3/loops-with-side-effects.html [ Failure ]
 crbug.com/981122 [ mac nvidia-0xfe9 ] conformance2/rendering/framebuffer-completeness-draw-framebuffer.html [ RetryOnFailure ]
 crbug.com/996344 [ mac nvidia-0xfe9 ] conformance2/textures/misc/tex-base-level-bug.html [ Failure ]
-crbug.com/483282 [ angle-no-backend mac nvidia-0xfe9 ] conformance2/textures/misc/tex-input-validation.html [ Failure ]
+crbug.com/483282 [ angle-disabled mac nvidia-0xfe9 ] conformance2/textures/misc/tex-input-validation.html [ Failure ]
 crbug.com/996344 [ mac nvidia-0xfe9 no-passthrough ] conformance2/textures/misc/tex-mipmap-levels.html [ Failure ]
 crbug.com/682834 [ mac nvidia-0xfe9 ] conformance2/textures/image_bitmap_from_video/tex-2d-rgba16f-rgba-half_float.html [ RetryOnFailure ]
 crbug.com/784817 [ mac nvidia-0xfe9 ] conformance/glsl/bugs/init-array-with-loop.html [ Failure ]
@@ -860,8 +860,8 @@ crbug.com/483282 [ linux amd ] deqp/functional/gles3/fbomultisample* [ Failure ]
 crbug.com/483282 [ linux amd ] deqp/functional/gles3/framebufferblit/conversion_07.html [ Failure ]
 crbug.com/658832 [ linux amd ] deqp/functional/gles3/framebufferblit/default_framebuffer_00.html [ Failure ]
 crbug.com/483282 [ linux amd ] conformance2/glsl3/vector-dynamic-indexing.html [ Failure ]
-crbug.com/483282 [ angle-no-backend linux amd ] conformance2/reading/read-pixels-pack-parameters.html [ Failure ]
-crbug.com/483282 [ angle-no-backend linux amd ] conformance2/textures/misc/tex-unpack-params.html [ Failure ]
+crbug.com/483282 [ angle-disabled linux amd ] conformance2/reading/read-pixels-pack-parameters.html [ Failure ]
+crbug.com/483282 [ angle-disabled linux amd ] conformance2/textures/misc/tex-unpack-params.html [ Failure ]
 crbug.com/662644 [ linux amd ] conformance2/rendering/clipping-wide-points.html [ Failure ]
 
 # TODO(kbr): re-enable after next conformance roll. crbug.com/736499
@@ -873,10 +873,10 @@ crbug.com/705865 [ linux amd ] conformance2/textures/image/tex-2d-r11f_g11f_b10f
 # Uniform buffer related failures
 crbug.com/483282 [ linux amd ] deqp/functional/gles3/uniformbuffers/random.html [ Failure ]
 crbug.com/angleproject/5014 [ linux amd ] conformance2/uniforms/uniform-blocks-with-arrays.html [ Failure ]
-crbug.com/809595 [ angle-no-backend linux amd ] conformance2/uniforms/simple-buffer-change.html [ Failure ]
+crbug.com/809595 [ angle-disabled linux amd ] conformance2/uniforms/simple-buffer-change.html [ Failure ]
 
 # Linux AMD R7 240
-crbug.com/696345 [ angle-no-backend linux amd-0x6613 ] conformance2/transform_feedback/switching-objects.html [ Failure ]
+crbug.com/696345 [ angle-disabled linux amd-0x6613 ] conformance2/transform_feedback/switching-objects.html [ Failure ]
 crbug.com/913301 [ linux amd-0x6613 ] conformance2/textures/misc/generate-mipmap-with-large-base-level.html [ Failure ]
 crbug.com/809237 [ linux amd-0x6613 ] conformance2/uniforms/incompatible-texture-type-for-sampler.html [ Skip ]
 crbug.com/1018028 [ linux amd-0x6613 ] conformance/rendering/bind-framebuffer-flush-bug.html [ Failure ]
@@ -978,7 +978,7 @@ crbug.com/1095679 [ android qualcomm-adreno-(tm)-540 no-passthrough ] conformanc
 
 # This test is failing on Android Pixel 2 and 3 (Qualcomm)
 # Seems to be an OpenGL ES bug.
-crbug.com/695742 [ android qualcomm angle-no-backend ] deqp/functional/gles3/multisample.html [ RetryOnFailure ]
+crbug.com/695742 [ android qualcomm angle-disabled ] deqp/functional/gles3/multisample.html [ RetryOnFailure ]
 
 # This test is flaky but can fail three times in a row so it must be
 # marked as Fail instead of Flaky.

content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt

@@ -30,17 +30,17 @@
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend
-# tags: [ angle-no-backend
+# tags: [ angle-disabled
 #         angle-d3d9 angle-d3d11
 #         angle-metal
 #         angle-opengl angle-opengles
 #         angle-swiftshader
 #         angle-vulkan ]
 # Skia Renderer
-# tags: [ dawn-skia-renderer
-#         gl-skia-renderer
-#         no-skia-renderer
-#         vulkan-skia-renderer ]
+# tags: [ skia-renderer-dawn
+#         skia-renderer-disabled
+#         skia-renderer-gl
+#         skia-renderer-vulkan ]
 # SwiftShader
 # tags: [ swiftshader-gl no-swiftshader-gl ]
 # Driver
@@ -91,14 +91,14 @@ crbug.com/849576 [ no-passthrough ] WebglExtension_KHR_parallel_shader_compile [
 crbug.com/776222 [ android ] WebglExtension_WEBGL_video_texture [ Skip ]
 
 # Extensions not available with SwiftShader
-crbug.com/1099955 [ swiftshader-gl angle-no-backend linux ] WebglExtension_EXT_disjoint_timer_query [ Skip ]
-crbug.com/1099955 [ swiftshader-gl angle-no-backend mac   ] WebglExtension_EXT_disjoint_timer_query [ Skip ]
-crbug.com/1099955 [ swiftshader-gl angle-no-backend win   ] WebglExtension_EXT_disjoint_timer_query [ Skip ]
-crbug.com/1099955 [ swiftshader-gl angle-no-backend linux ] WebglExtension_EXT_shader_texture_lod [ Skip ]
-crbug.com/1099955 [ swiftshader-gl angle-no-backend mac   ] WebglExtension_EXT_shader_texture_lod [ Skip ]
-crbug.com/1099955 [ swiftshader-gl angle-no-backend win   ] WebglExtension_EXT_shader_texture_lod [ Skip ]
-crbug.com/1099955 [ swiftshader-gl angle-no-backend linux ] WebglExtension_EXT_texture_compression_bptc [ Skip ]
-crbug.com/1099955 [ swiftshader-gl angle-no-backend win   ] WebglExtension_EXT_texture_compression_bptc [ Skip ]
+crbug.com/1099955 [ swiftshader-gl angle-disabled linux ] WebglExtension_EXT_disjoint_timer_query [ Skip ]
+crbug.com/1099955 [ swiftshader-gl angle-disabled mac   ] WebglExtension_EXT_disjoint_timer_query [ Skip ]
+crbug.com/1099955 [ swiftshader-gl angle-disabled win   ] WebglExtension_EXT_disjoint_timer_query [ Skip ]
+crbug.com/1099955 [ swiftshader-gl angle-disabled linux ] WebglExtension_EXT_shader_texture_lod [ Skip ]
+crbug.com/1099955 [ swiftshader-gl angle-disabled mac   ] WebglExtension_EXT_shader_texture_lod [ Skip ]
+crbug.com/1099955 [ swiftshader-gl angle-disabled win   ] WebglExtension_EXT_shader_texture_lod [ Skip ]
+crbug.com/1099955 [ swiftshader-gl angle-disabled linux ] WebglExtension_EXT_texture_compression_bptc [ Skip ]
+crbug.com/1099955 [ swiftshader-gl angle-disabled win   ] WebglExtension_EXT_texture_compression_bptc [ Skip ]
 crbug.com/1099955 [ angle-swiftshader no-swiftshader-gl linux ] WebglExtension_EXT_disjoint_timer_query [ Skip ]
 crbug.com/1099955 [ angle-swiftshader no-swiftshader-gl mac   ] WebglExtension_EXT_disjoint_timer_query [ Skip ]
 crbug.com/1099955 [ angle-swiftshader no-swiftshader-gl win   ] WebglExtension_EXT_disjoint_timer_query [ Skip ]
@@ -417,9 +417,9 @@ crbug.com/929009 [ mac amd ] conformance/glsl/misc/shader-with-non-reserved-word
 crbug.com/886970 [ mac intel-0xa2e angle-opengl ] conformance/rendering/canvas-alpha-bug.html [ Failure ]
 crbug.com/782317 [ mac intel angle-opengl ] conformance/rendering/rendering-stencil-large-viewport.html [ Failure ]
 crbug.com/1018028 [ mac intel angle-opengl ] conformance/rendering/bind-framebuffer-flush-bug.html [ Failure ]
-crbug.com/886970 [ mac intel-0xa2e angle-no-backend ] conformance/rendering/canvas-alpha-bug.html [ Failure ]
-crbug.com/782317 [ mac intel angle-no-backend ] conformance/rendering/rendering-stencil-large-viewport.html [ Failure ]
-crbug.com/1018028 [ mac intel angle-no-backend ] conformance/rendering/bind-framebuffer-flush-bug.html [ Failure ]
+crbug.com/886970 [ mac intel-0xa2e angle-disabled ] conformance/rendering/canvas-alpha-bug.html [ Failure ]
+crbug.com/782317 [ mac intel angle-disabled ] conformance/rendering/rendering-stencil-large-viewport.html [ Failure ]
+crbug.com/1018028 [ mac intel angle-disabled ] conformance/rendering/bind-framebuffer-flush-bug.html [ Failure ]
 crbug.com/1092734 [ mac passthrough intel angle-opengl ] conformance/textures/webgl_canvas/tex-2d-rgba-rgba* [ Failure ]
 
 # Mac Retina NVidia failures
@@ -549,14 +549,14 @@ crbug.com/352645 [ android ] conformance/textures/video/tex-2d-rgb-rgb-unsigned_
 crbug.com/352645 [ android android-webview-instrumentation ] conformance/textures/video/tex-2d-rgba-rgba-unsigned_byte.html [ Skip ]
 crbug.com/352645 [ android android-webview-instrumentation ] conformance/textures/video/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html [ Skip ]
 crbug.com/352645 [ android android-webview-instrumentation ] conformance/textures/video/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html [ Skip ]
-crbug.com/352645 [ android android-webview-instrumentation angle-no-backend ] conformance/textures/misc/texture-npot-video.html [ Skip ]
+crbug.com/352645 [ android android-webview-instrumentation angle-disabled ] conformance/textures/misc/texture-npot-video.html [ Skip ]
 
 # These video tests appear to be flaky.
 crbug.com/834933 [ android android-chromium ] conformance/textures/video/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html [ RetryOnFailure ]
 crbug.com/907512 [ android android-chromium ] conformance/textures/video/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html [ RetryOnFailure ]
 crbug.com/733599 [ android ] conformance/textures/video/tex-2d-alpha-alpha-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/733599 [ android angle-no-backend ] conformance/textures/video/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/733599 [ android angle-no-backend ] conformance/textures/video/tex-2d-luminance-luminance-unsigned_byte.html [ RetryOnFailure ]
+crbug.com/733599 [ android angle-disabled ] conformance/textures/video/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html [ RetryOnFailure ]
+crbug.com/733599 [ android angle-disabled ] conformance/textures/video/tex-2d-luminance-luminance-unsigned_byte.html [ RetryOnFailure ]
 crbug.com/834933 [ android android-chromium ] conformance/textures/video/tex-2d-rgb-rgb-unsigned_byte.html [ RetryOnFailure ]
 crbug.com/834933 [ android android-chromium ] conformance/textures/video/tex-2d-rgba-rgba-unsigned_byte.html [ RetryOnFailure ]
 crbug.com/891456 [ android ] conformance/textures/image_bitmap_from_video/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html [ RetryOnFailure ]
@@ -641,7 +641,7 @@ crbug.com/1122644 [ android qualcomm-adreno-(tm)-418 ] conformance/textures/misc
 
 # Nexus 6 (Adreno 420) and 6P (Adreno 430)
 crbug.com/499555 [ android qualcomm-adreno-(tm)-420 ] conformance/context/context-attributes-alpha-depth-stencil-antialias.html [ Failure ]
-crbug.com/611945 [ android angle-no-backend qualcomm-adreno-(tm)-420 ] conformance/context/context-size-change.html [ Failure ]
+crbug.com/611945 [ android angle-disabled qualcomm-adreno-(tm)-420 ] conformance/context/context-size-change.html [ Failure ]
 crbug.com/499555 [ android qualcomm-adreno-(tm)-420 ] conformance/context/premultiplyalpha-test.html [ Failure ]
 crbug.com/611945 [ android qualcomm-adreno-(tm)-420 ] conformance/glsl/bugs/gl-fragcoord-multisampling-bug.html [ Failure ]
 crbug.com/611945 [ android qualcomm-adreno-(tm)-420 ] conformance/glsl/bugs/qualcomm-crash.html [ Failure ]

content/test/gpu/gpu_tests/webgl_conformance_integration_test.py

@@ -226,7 +226,7 @@ class WebGLConformanceIntegrationTest(gpu_integration_test.GpuIntegrationTest):
     # Verify that Chrome's GL backend matches if a specific one was requested
     if self._gl_backend:
       if (self._gl_backend == 'angle'
-          and gpu_helper.GetANGLERenderer(gpu_info) == 'angle-no-backend'):
+          and gpu_helper.GetANGLERenderer(gpu_info) == 'angle-disabled'):
         self.fail('requested GL backend (' + self._gl_backend + ')' +
                   ' had no effect on the browser: ' +
                   _GetGPUInfoErrorString(gpu_info))

content/test/gpu/validate_tag_consistency.py

@@ -41,17 +41,17 @@ TAG_HEADER = """\
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend
-# tags: [ angle-no-backend
+# tags: [ angle-disabled
 #         angle-d3d9 angle-d3d11
 #         angle-metal
 #         angle-opengl angle-opengles
 #         angle-swiftshader
 #         angle-vulkan ]
 # Skia Renderer
-# tags: [ dawn-skia-renderer
-#         gl-skia-renderer
-#         no-skia-renderer
-#         vulkan-skia-renderer ]
+# tags: [ skia-renderer-dawn
+#         skia-renderer-disabled
+#         skia-renderer-gl
+#         skia-renderer-vulkan ]
 # SwiftShader
 # tags: [ swiftshader-gl no-swiftshader-gl ]
 # Driver