Re-land of Update WebGL CTS 1 expected failures.

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_test_expectations import GpuTestExpectations
 
 # See the GpuTestExpectations class for documentation.
 
 class WebGLConformanceExpectations(GpuTestExpectations):
@@ skipping 12 matching lines @@
   def CheckPatternIsValid(self, pattern):
     # Look for basic wildcards.
     if not '*' in pattern:
       full_path = os.path.normpath(os.path.join(self.conformance_path, pattern))
       if not os.path.exists(full_path):
         raise Exception('The WebGL conformance test path specified in' +
           'expectation does not exist: ' + full_path)
 
   def SetExpectations(self):
     # Fails on all platforms
-    self.Fail('deqp/data/gles2/shaders/constant_expressions.html',
-        bug=478572)
-    self.Fail('deqp/data/gles2/shaders/constants.html',
-        bug=478572)
-    self.Fail('deqp/data/gles2/shaders/fragdata.html',
-        bug=478572)
     self.Fail('deqp/data/gles2/shaders/functions.html',
         bug=478572)
-    self.Fail('deqp/data/gles2/shaders/linkage.html',
-        bug=478572)
     self.Fail('deqp/data/gles2/shaders/preprocessor.html',
         bug=478572)
     self.Fail('deqp/data/gles2/shaders/scoping.html',
         bug=478572)
-    self.Fail('conformance/glsl/misc/const-variable-initialization.html',
-        bug=485632)
     self.Fail('conformance/misc/expando-loss.html',
         bug=485634)
 
     # Win failures
     self.Fail('conformance/glsl/bugs/' +
               'pow-of-small-constant-in-user-defined-function.html',
         ['win'], bug=485641)
     self.Fail('conformance/glsl/bugs/sampler-struct-function-arg.html',
         ['win'], bug=485642)
 
@@ skipping 74 matching lines @@
     self.Fail('conformance/textures/misc/gl-pixelstorei.html',
         ['win', 'opengl'], bug=1007) # angle bug ID
     self.Fail('conformance/textures/misc/tex-image-canvas-corruption.html',
         ['win', 'opengl'], bug=1007) # angle bug ID
     self.Fail('deqp/data/gles2/shaders/conditionals.html',
         ['win', 'opengl'], bug=1007) # angle bug ID
     self.Fail('deqp/data/gles2/shaders/conversions.html',
         ['win', 'opengl'], bug=1007) # angle bug ID
     self.Fail('deqp/data/gles2/shaders/qualification_order.html',
         ['win', 'opengl'], bug=1007) # angle bug ID
+    self.Fail('deqp/data/gles2/shaders/linkage.html',
+        ['win', 'opengl'], bug=1007) # angle bug ID
 
     # Win / OpenGL / AMD failures
     self.Fail('conformance/extensions/oes-texture-half-float-linear.html',
         ['win', 'amd', 'opengl'], bug=1007) # angle bug ID
     self.Fail('conformance/extensions/' +
         'oes-texture-half-float-with-image-data.html',
         ['win', 'amd', 'opengl'], bug=1007) # angle bug ID
     self.Fail('conformance/extensions/oes-texture-half-float-with-image.html',
         ['win', 'amd', 'opengl'], bug=1007) # angle bug ID
     self.Fail('conformance/extensions/oes-texture-half-float-with-video.html',
@@ skipping 35 matching lines @@
     self.Fail('conformance/glsl/misc/shaders-with-invariance.html',
         ['win', 'amd', 'opengl'], bug=1007) # angle bug ID
     self.Fail('conformance/glsl/misc/struct-nesting-of-variable-names.html',
         ['win', 'amd', 'opengl'], bug=1007) # angle bug ID
     self.Fail('conformance/rendering/gl-scissor-test.html',
         ['win', 'amd', 'opengl'], bug=1007) # angle bug ID
     self.Fail('conformance/state/gl-get-calls.html',
         ['win', 'amd', 'opengl'], bug=1007) # angle bug ID
     self.Fail('conformance/uniforms/gl-uniform-arrays.html',
         ['win', 'amd', 'opengl'], bug=1007) # angle bug ID
+    self.Fail('deqp/data/gles2/shaders/constant_expressions.html',
+        ['win', 'amd', 'opengl'], bug=1007) # angle bug ID
+    self.Fail('deqp/data/gles2/shaders/constants.html',
+        ['win', 'amd', 'opengl'], bug=1007) # angle bug ID
 
     # Skip all WebGL CTS on OpenGL+Intel
     self.Skip('*', ['win', 'opengl', 'intel'], bug=1007) # angle bug ID
 
     # Mac failures
     self.Fail('conformance/glsl/misc/shaders-with-invariance.html',
         ['mac'], bug=421710)
 
     # Mac / Intel failures
     # Radar 13499466
@@ skipping 472 matching lines @@
         ['mac'], bug=483282)
     self.Fail('conformance2/glsl3/array-equality.html',
         ['mac'], bug=483282)
     self.Fail('conformance2/glsl3/array-in-complex-expression.html',
         ['mac'], bug=483282)
     self.Fail('conformance2/renderbuffers/' +
         'multisampled-renderbuffer-initialization.html',
         ['mac'], bug=483282)
     self.Fail('conformance2/rendering/instanced-arrays.html',
         ['mac'], bug=483282)