Update WebGL conformance test expectations.

content/test/gpu/gpu_tests/webgl_conformance_expectations.py

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 import os
 
 from gpu_tests.gpu_test_expectations import GpuTestExpectations
 
 # See the GpuTestExpectations class for documentation.
 
 class WebGLConformanceExpectations(GpuTestExpectations):
@@ skipping 531 matching lines @@
                 ('nvidia', 'NVIDIA Tegra')], bug=624621)
     self.Fail('conformance/glsl/bugs/constant-precision-qualifier.html',
               ['android', 'android-chromium',
                ('nvidia', 'NVIDIA Tegra')], bug=624621)
 
     # ========================
     # Conformance expectations
     # ========================
     # Fails on all platforms
 
-    self.Fail('conformance/glsl/bugs/' +
-              'invariant-does-not-leak-across-shaders.html',
-              bug=634813)
-
     # We need to add WebGL 1 check in command buffer that format/type from
     # TexSubImage2D have to match the current texture's.
     self.Fail('conformance/textures/misc/tex-sub-image-2d-bad-args.html',
         bug=570453)
 
-    self.Fail('conformance/extensions/webgl-draw-buffers.html',
-        bug=625365)
-    # self.Fail('conformance/extensions/webgl-draw-buffers.html',
-    #     ['win', 'intel', 'opengl'], bug=1007) # angle bug ID
-    # self.Fail('conformance/extensions/webgl-draw-buffers.html',
-    #     ['mavericks', ('nvidia', 0xfe9)], bug=586536)
-    # self.Fail('conformance/extensions/webgl-draw-buffers.html',
-    #     ['linux', ('intel', 0x412), 'opengl'], bug=586536)
-
     # OpenGL / NVIDIA failures
     self.Fail('conformance/attribs/gl-disabled-vertex-attrib.html',
         ['win', 'linux', 'nvidia', 'opengl'], bug=1007) # angle bug ID
 
     # Win failures
     self.Fail('conformance/extensions/oes-texture-half-float.html',
         ['win'], bug=607283)
     # Note that the following test seems to pass, but it may still be flaky.
     self.Fail('conformance/glsl/constructors/' +
               'glsl-construct-vec-mat-index.html',
@@ skipping 70 matching lines @@
 
     # Mac failures
     self.Fail('conformance/glsl/misc/shaders-with-invariance.html',
         ['mac'], bug=421710)
     self.Fail('deqp/data/gles2/shaders/scoping.html',
         ['mac'], bug=478572)
 
     # Mac Retina AMD failures
     self.Flaky('conformance/extensions/oes-texture-float-with-video.html',
         ['mac', ('amd', 0x6821)], bug=599272)
+    self.Fail('conformance/extensions/webgl-draw-buffers.html',
+        ['mac', ('amd', 0x6821)], bug=625365)
 
     # Linux failures
     self.Flaky('conformance/textures/video/' +
                'tex-2d-rgba-rgba-unsigned_byte.html',
                ['linux'], bug=627525)
     self.Flaky('conformance/textures/video/' +
                'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
                ['linux'], bug=627525)
     self.Flaky('conformance/textures/video/' +
                'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
@@ skipping 293 matching lines @@
     self.Fail('conformance/textures/misc/texture-npot.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/textures/misc/texture-npot-video.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/textures/misc/texture-size.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/uniforms/gl-uniform-arrays.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Skip('conformance/uniforms/uniform-default-values.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)