Add back some WebGL test expectations

A lot of expectations were removed but some of them were still
necessary, this adds them back.

TBR=kbr@chromium.org
BUG=chromium:693135
BUG=chromium:772651
BUG=chromium:798117
BUG=chromium:874620
BUG=chromium:887241

Change-Id: Ib3bccdf2ff48a28a8f0a3ce428239980a58c5266
Reviewed-on: https://chromium-review.googlesource.com/c/1333650Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607626}

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

@@ -52,6 +52,9 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail(
         'conformance2/glsl3/const-struct-from-array-as-function-parameter.html',
         ['linux', 'nvidia'], bug=874620)
+    self.Fail(
+        'conformance2/glsl3/const-struct-from-array-as-function-parameter.html',
+        ['win', 'nvidia', 'opengl'], bug=874620)
 
     # Failing new test added in https://github.com/KhronosGroup/WebGL/pull/2665
     self.Fail('conformance2/textures/misc/tex-subimage3d-canvas-bug.html',
@@ -80,6 +83,8 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     # TODO(http://crbug.com/887241): Upgrade the drivers on the bots.
     self.Fail('conformance/glsl/bugs/vector-scalar-arithmetic-inside-loop.html',
         ['linux', 'nvidia'], bug=772651)
+    self.Fail('conformance/glsl/bugs/vector-scalar-arithmetic-inside-loop.html',
+        ['android', 'nvidia'], bug=772651)
     self.Fail('conformance/glsl/bugs/' +
         'vector-scalar-arithmetic-inside-loop-complex.html',
         ['nvidia'], bug=772651)

content/test/gpu/gpu_tests/webgl_conformance_expectations.py

@@ -116,6 +116,8 @@ class WebGLConformanceExpectations(GpuTestExpectations):
         ['win', 'nvidia', 'vulkan'], bug=798117)
     self.Fail('conformance/glsl/bugs/assign-to-swizzled-twice-in-function.html',
         ['linux', 'nvidia'], bug=798117)
+    self.Fail('conformance/glsl/bugs/assign-to-swizzled-twice-in-function.html',
+        ['android', 'nvidia'], bug=798117)
     self.Fail('conformance/glsl/bugs/' +
         'in-parameter-passed-as-inout-argument-and-global.html',
         ['nvidia'], bug=792210)
@@ -867,10 +869,9 @@ class WebGLConformanceExpectations(GpuTestExpectations):
     self.Fail('conformance/uniforms/uniform-samplers-test.html',
         ['android', ('qualcomm', 'Adreno (TM) 430'), 'no_passthrough'],
         bug=663071)
-    # TODO(fserb): uncomment this once the overall self.Fail is removed above.
-    # self.Fail('conformance/offscreencanvas/' +
-    #     'context-attribute-preserve-drawing-buffer.html',
-    #     ['android', ('qualcomm', 'Adreno (TM) 420')], bug=693135)
+    self.Fail('conformance/offscreencanvas/' +
+        'context-attribute-preserve-drawing-buffer.html',
+        ['android', ('qualcomm', 'Adreno (TM) 420')], bug=693135)
     self.Fail('WebglExtension_EXT_sRGB',
         ['android',
          ('qualcomm', 'Adreno (TM) 420'), ('qualcomm', 'Adreno (TM) 430')])