Enable ANGLE workaround for unused std140/shared blocks bug

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

 # Copyright (c) 2015 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.
 from gpu_tests.webgl_conformance_expectations import WebGLConformanceExpectations
 
 # See the GpuTestExpectations class for documentation.
 
 class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
   def __init__(self, conformance_path, url_prefixes=None):
     super(WebGL2ConformanceExpectations, self).__init__(
@@ skipping 185 matching lines @@
         'framebuffer-completeness-unaffected.html',
         ['mac'], bug=630800)
     self.Fail('deqp/functional/gles3/fbocompleteness.html',
         ['mac'], bug=630800)
     # self.Fail('deqp/functional/gles3/fbocompleteness.html',
     #     ['mac', ('nvidia', 0xfe9)], bug=616562)
 
     self.Fail('deqp/data/gles3/shaders/linkage.html',
         ['mac'], bug=641129)
 
-    self.Fail('deqp/functional/gles3/uniformbuffers/random.html',
-        ['mac'], bug=618464)
-
     # This is due to "centroid out" / "in" mismatch.
     self.Fail('deqp/data/gles3/shaders/qualification_order.html',
         ['mac'], bug=483282)
 
     self.Fail('conformance2/renderbuffers/framebuffer-test.html',
         ['mac'], bug=641149)
 
     self.Fail('deqp/functional/gles3/fbomultisample*',
         ['mac', 'intel'], bug=641209)
 
@@ skipping 243 matching lines @@
 
     self.Fail('deqp/functional/gles3/shaderoperator/' +
         'angle_and_trigonometry_02.html',
         ['mac', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/shaderoperator/' +
         'angle_and_trigonometry_03.html',
         ['mac', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/shaderoperator/geometric.html',
         ['mac', 'amd'], bug=483282)
 
+    # Fixed on OSX 10.12
+    self.Fail('deqp/functional/gles3/uniformbuffers/random.html',
+        ['mac', 'amd'], bug=618464)
+
     self.Flaky('deqp/functional/gles3/shaderindexing/mat_02.html',
         ['mac', 'amd'], bug=644360)
 
     # Mac Pro with AMD GPU
     self.Fail('conformance2/textures/misc/tex-mipmap-levels.html',
         ['mac', ('amd', 0x679e)], bug=483282)
     self.Flaky('deqp/functional/gles3/shaderindexing/mat_01.html',
         ['mac', ('amd', 0x679e)], bug=636648)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texturesize.html',
@@ skipping 38 matching lines @@
     self.Fail('deqp/functional/gles3/framebufferblit/rect_02.html',
         ['mac', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/framebufferblit/rect_03.html',
         ['mac', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/framebufferblit/rect_04.html',
         ['mac', 'intel'], bug=483282)
 
     self.Fail('conformance2/textures/misc/tex-unpack-params.html',
         ['mac', 'intel'], bug=483282)
 
+    # Fixed on OSX 10.11
+    self.Fail('deqp/functional/gles3/uniformbuffers/random.html',
+        ['mac', 'intel'], bug=618464)
+
     # Linux only.
     self.Fail('conformance2/buffers/get-buffer-sub-data.html',
         ['linux'], bug=654201)
 
     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)
@@ skipping 372 matching lines @@
     # self.Fail(page_name,
     #     ['linux', ('nvidia', 0x1), 'debug', 'opengl'])
     # self.Fail(page_name,
     #     ['win', ('nvidia', 0x1), 'debug', 'opengl'])
 
     # Conflicts if between a generic os condition and a specific version
     # self.Fail(page_name,
     #     ['xp', ('nvidia', 0x1), 'debug', 'opengl'])
     # self.Fail(page_name,
     #     ['win', ('nvidia', 0x1), 'debug', 'opengl'])