Mark VAO tests as failing with ANGLE's OpenGL backend.

Too flaky to continue to run.

  conformance/extensions/oes-vertex-array-object.html
  conformance2/vertex_arrays/vertex-array-object.html

Bug: 932794, 920265
Change-Id: I0b12b32ddc3067d1ae000f7f883c4f2b7203ec8b
Tbr: ynovikov@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/1484823Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#634931}

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

@@ -330,7 +330,7 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['passthrough', 'opengl'], bug=602688)
     self.Fail('conformance2/state/gl-get-calls.html', ['passthrough', 'opengl'],
         bug=602688)
-    self.Flaky('conformance2/vertex_arrays/vertex-array-object.html',
+    self.Fail('conformance2/vertex_arrays/vertex-array-object.html',
         ['passthrough', 'opengl'], bug=920265)
     self.Fail('deqp/functional/gles3/integerstatequery.html',
         ['passthrough', 'opengl'], bug=602688)

content/test/gpu/gpu_tests/webgl_conformance_expectations.py

@@ -131,6 +131,10 @@ class WebGLConformanceExpectations(GpuTestExpectations):
     self.Skip('conformance/rendering/texture-switch-performance.html',
         bug=735483)
 
+    # Too flaky with ANGLE's OpenGL backend to just mark Flaky
+    self.Fail('conformance/extensions/oes-vertex-array-object.html',
+        ['win', 'opengl'], bug=920033)
+
     # Passthrough command decoder / OpenGL
     self.Fail('conformance/renderbuffers/framebuffer-test.html',
         ['passthrough', 'opengl'], bug=665521)
@@ -340,8 +344,6 @@ class WebGLConformanceExpectations(GpuTestExpectations):
         ['win10', 'intel', 'opengl', 'no_passthrough'], bug=680797)
     self.Fail('conformance/extensions/oes-texture-half-float-with-canvas.html',
         ['win10', 'intel', 'opengl', 'no_passthrough'], bug=680797)
-    self.Fail('conformance/extensions/oes-vertex-array-object.html',
-        ['win10', 'intel', 'opengl'], bug=680797)
     self.Fail('conformance/glsl/bugs/' +
         'array-of-struct-with-int-first-position.html',
         ['win10', 'intel', 'opengl'], bug=680797)