Update WebGL2 conformance test expectations

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):
     super(WebGL2ConformanceExpectations, self).__init__(conformance_path)
@@ skipping 28 matching lines @@
     self.Skip('deqp/functional/gles3/texturefiltering/cube_combinations_*',
         ['mac', ('nvidia', 0xfe9)], bug=1)
 
     # All platforms.
     self.Skip('deqp/functional/gles3/builtinprecision/atan2.html', bug=619403)
     self.Skip('deqp/functional/gles3/builtinprecision/tanh.html', bug=619403)
     self.Skip('deqp/functional/gles3/fbocolorbuffer/*.html', bug=618408)
     self.Skip('deqp/functional/gles3/fboinvalidate.html', bug=483282)
     self.Skip('deqp/functional/gles3/fbomultisample.html', bug=483282)
     self.Skip('deqp/functional/gles3/fborender.html', bug=483282)
-    self.Skip('deqp/functional/gles3/fragmentoutput.html', bug=483282)
     self.Skip('deqp/functional/gles3/framebufferblit.html', bug=483282)
     self.Skip('deqp/data/gles3/shaders/linkage.html', bug=601821)
     self.Flaky('deqp/functional/gles3/negativefragmentapi.html', bug=604794)
     self.Skip('deqp/functional/gles3/shaderoperator/*.html', bug=483282)
-    self.Skip('deqp/functional/gles3/textureshadow/*.html', bug=483282)
 
     self.Fail('deqp/data/gles3/shaders/preprocessor.html', bug=483282)
 
     self.Fail('conformance2/glsl3/forbidden-operators.html', bug=483282)
 
     self.Flaky('conformance2/query/occlusion-query.html', bug=603168)
 
     self.Fail('conformance2/rendering/draw-buffers.html', bug=617410)
 
     # Avoid a conflict with a Mac expectation by setting
@@ skipping 52 matching lines @@
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texturegradoffset.html',
         ['win'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'textureprojgrad.html',
         ['win'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'textureprojgradoffset.html',
         ['win'], bug=483282)
 
+    self.Fail('deqp/functional/gles3/textureshadow/2d*',
+        ['win'], bug=483282)
+    self.Fail('deqp/functional/gles3/textureshadow/cube*',
+        ['win'], bug=483282)
+
     self.Flaky('deqp/functional/gles3/buffercopy.html', ['win'], bug=587601)
 
     self.Skip('deqp/functional/gles3/readpixel.html', ['win'], bug=483282)
     self.Fail('conformance2/glsl3/array-in-complex-expression.html',
         ['win'], bug=483282)
     self.Skip('conformance2/reading/read-pixels-pack-parameters.html',
         ['win'], bug=483282)
     self.Skip('conformance2/textures/misc/tex-mipmap-levels.html',
         ['win'], bug=483282)
     self.Skip('conformance2/transform_feedback/transform_feedback.html',
@@ skipping 47 matching lines @@
         ['win', ('amd', 0x6779)], bug=614573)
     self.Fail('deqp/functional/gles3/shadertexturefunction/texture.html',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texelfetchoffset.html',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/texturesize.html',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/shadercommonfunction.html',
         ['win', ('amd', 0x6779)], bug=621201)
+    self.Fail('deqp/functional/gles3/fragmentoutput.html',
+        ['win', 'amd'], bug=483282)
 
     # Win / Intel
     self.Fail('conformance2/buffers/uniform-buffers.html',
         ['win', 'intel'], bug=483282)
     self.Skip('conformance2/textures/misc/copy-texture-image.html',
         ['win', 'intel'], bug=617449)
     self.Fail('deqp/functional/gles3/shaderderivate.html',
         ['win', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/shaderstruct.html',
         ['win', 'intel'], bug=483282)
@@ skipping 25 matching lines @@
         ['win', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texelfetchoffset.html',
         ['win', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/texturesize.html',
         ['win', 'intel'], bug=483282)
     self.Fail('conformance2/textures/misc/tex-unpack-params.html',
         ['win', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/uniformbuffers/*.html',
         ['win', 'intel'], bug=483282)
+    self.Fail('deqp/functional/gles3/textureshadow/cube*.html',
+        ['mac', 'intel'], bug=483282)
 
     # Mac only.
     self.Flaky('deqp/functional/gles3/shaderindexing/varying.html',
         ['mac'], bug=619264)
     self.Fail('deqp/functional/gles3/shaderloop_do_while.html',
         ['mac'], bug=617820)
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'basic_copyteximage2d.html',
         ['mac'], bug=620067)
+    self.Fail('deqp/functional/gles3/fragmentoutput.html',
+        ['mac'], bug=483282)
     # This one's flaky on AMD, NVIDIA and Intel GPUs, but the
     # GPU-specific expectations aren't working properly.
     self.Fail('deqp/functional/gles3/shaderpackingfunction.html',
         ['mac'], bug=619264)
     self.Fail('deqp/functional/gles3/uniformbuffers/random.html',
         ['mac'], bug=618464)
 
     self.Fail('deqp/functional/gles3/textureformat/compressed_2d.html',
         ['mac'], bug=612205)
     self.Fail('deqp/functional/gles3/textureformat/compressed_cube.html',
@@ skipping 462 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'])