Mark WebGL *textures/webgl_canvas* tests flaky on Windows AMD

BUG=878780
TBR=kbr@chromium.org

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: If539f1b8ae9444fd79fcc011a0e4aad966ce1587
Reviewed-on: https://chromium-review.googlesource.com/1195439
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587366}

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

@@ -278,15 +278,8 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Flaky('conformance2/textures/misc/' +
         'copy-texture-image-webgl-specific.html',
         ['win', 'amd', 'd3d11'], bug=828984)
-    self.Flaky('conformance2/textures/webgl_canvas/' +
-        'tex-3d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html',
-        ['win', 'amd', 'd3d11'], bug=828984)
-    self.Flaky('conformance2/textures/webgl_canvas/' +
-        'tex-3d-rg16f-rg-half_float.html',
-        ['win', 'amd', 'd3d11'], bug=828984)
-    self.Flaky('conformance2/textures/webgl_canvas/' +
-        'tex-3d-rgba8ui-rgba_integer-unsigned_byte.html',
-        ['win', 'amd', 'd3d11'], bug=828984)
+    self.Flaky('conformance2/textures/webgl_canvas/*', ['win', 'amd'],
+        bug=878780)
 
     # Recent AMD drivers seem to have a regression with 3D textures.
     self.Fail('conformance2/textures/canvas_sub_rectangle/tex-3d-*',

content/test/gpu/gpu_tests/webgl_conformance_expectations.py

@@ -275,6 +275,10 @@ class WebGLConformanceExpectations(GpuTestExpectations):
     self.Fail('conformance/extensions/oes-texture-half-float.html',
               ['win', 'no_passthrough', ('amd', 0x6613)], bug=653533)
 
+    # Win / AMD D3D11 failures
+    self.Flaky('conformance/textures/webgl_canvas/*', ['win', 'amd'],
+        bug=878780)
+
     # Win / AMD D3D9 failures
     self.Fail('conformance/extensions/angle-instanced-arrays.html',
         ['win', 'amd', 'd3d9'], bug=475095)