Revert of Roll WebGL conformance tests.

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.
 
 from telemetry.page import test_expectations
 
 # Valid expectation conditions are:
 #
 # Operating systems:
 #     win, xp, vista, win7, mac, leopard, snowleopard, lion, mountainlion,
 #     mavericks, yosemite, linux, chromeos, android
 #
 # GPU vendors:
 #     amd, arm, broadcom, hisilicon, intel, imagination, nvidia, qualcomm,
 #     vivante
 #
 # Specific GPUs can be listed as a tuple with vendor name and device ID.
 # Examples: ('nvidia', 0x1234), ('arm', 'Mali-T604')
 # Device IDs must be paired with a GPU vendor.
 
 class WebGLConformanceExpectations(test_expectations.TestExpectations):
   def SetExpectations(self):
     # Sample Usage:
     # self.Fail('gl-enable-vertex-attrib.html',
     #     ['mac', 'amd', ('nvidia', 0x1234)], bug=123)
 
     # Fails on all platforms
-    self.Fail('conformance/glsl/misc/shaders-with-invariance.html',
-        bug=421710)
-    self.Fail('conformance/glsl/misc/struct-unary-operators.html',
-        bug=421709)
-    self.Fail('conformance/renderbuffers/feedback-loop.html',
-        bug=421695)
-    self.Fail('conformance/textures/texture-copying-feedback-loops.html',
-        bug=421695)
-    self.Fail('conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas.html',
-        bug=420357)
+    self.Fail('conformance/glsl/misc/shaders-with-uniform-structs.html',
+        bug=351396)
 
     # Flaky on Win
     self.Fail('conformance/extensions/webgl-draw-buffers.html',
         ['win'], bug=369349)
 
     # Win failures
     self.Fail('conformance/glsl/misc/struct-equals.html',
         ['win'], bug=391957)
     self.Fail('conformance/glsl/bugs/conditional-discard-in-loop.html',
         ['win'], bug=402195)
     self.Fail('conformance/attribs/gl-bindAttribLocation-matrix.html',
         ['win'], bug=415688)
-    self.Fail('conformance/attribs/gl-bindAttribLocation-aliasing.html',
-        ['win'], bug=415688)
-    self.Fail('conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgb565.html',
-        ['win'], bug=420357)
-    self.Fail('conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba4444.html',
-        ['win'], bug=420357)
-    self.Fail('conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba5551.html',
-        ['win'], bug=420357)
-    self.Fail('conformance/glsl/misc/ternary-operators-in-global-initializers.html',
-        ['win'], bug=415694)
-    self.Fail('conformance/glsl/misc/ternary-operators-in-initializers.html',
-        ['win'], bug=415694)
-
 
     # Win7 / Intel failures
     self.Fail('conformance/rendering/gl-scissor-test.html',
         ['win7', 'intel'], bug=314997)
     self.Fail('conformance/context/premultiplyalpha-test.html',
         ['win7', 'intel'])
     self.Fail('conformance/textures/copy-tex-image-and-sub-image-2d.html',
         ['win7', 'intel'])
     self.Fail('conformance/rendering/gl-viewport-test.html',
         ['win7', 'intel'], bug=372511)
@@ skipping 71 matching lines @@
     self.Skip('conformance/ogles/GL/refract/refract_001_to_006.html',
         ['lion', 'intel'], bug=323736)
     self.Skip('conformance/ogles/GL/tan/tan_001_to_006.html',
         ['lion', 'intel'], bug=323736)
     # Two flaky tests.
     self.Fail('conformance/ogles/GL/functions/functions_049_to_056.html',
         ['lion', 'intel'], bug=393331)
     self.Fail('conformance/extensions/webgl-compressed-texture-size-limit.html',
         ['lion', 'intel'], bug=393331)
 
-    # Linux failures
-    self.Fail('conformance/textures/default-texture.html',
-        ['linux', ('nvidia', 0x104a)], bug=422152)
-
     # Android failures
     # The following test is very slow and therefore times out on Android bot.
     self.Skip('conformance/rendering/multisample-corruption.html',
         ['android'])
     # The following test times out on Android bot.
     self.Fail('conformance/uniforms/gl-uniform-arrays.html',
         ['android'], bug=369300)
     self.Fail('conformance/glsl/misc/empty_main.vert.html',
         ['android'], bug=315976)
     self.Fail('conformance/glsl/misc/gl_position_unset.vert.html',
@@ skipping 100 matching lines @@
     self.Fail('conformance/textures/texture-npot-video.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/textures/texture-size.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/textures/texture-size-limit.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)