Update WebGL2 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 359 matching lines @@
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
 
     # Nexus 9
     self.Fail('WebglExtension.WEBGL_compressed_texture_atc',
               ['android', ('nvidia', 'NVIDIA Tegra')])
 
     # ========================
     # Conformance expectations
     # ========================
     # Fails on all platforms
-    self.Fail('deqp/data/gles2/shaders/functions.html',
-        bug=478572)
 
     # 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)
 
     # Fails on multiple platforms
 
     # 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 two tests pass with OpenGL.
     self.Fail('conformance/glsl/bugs/' +
               'pow-of-small-constant-in-user-defined-function.html',
         ['win'], bug=485641)
     # 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',
               ['win'], bug=525188)
     self.Flaky('deqp/data/gles2/shaders/constants.html', ['win'], bug=594922)
     self.Fail('conformance/rendering/point-specific-shader-variables.html',
         ['win'], bug=616335)
 
+    # Win NVIDIA failures
+    self.Fail('deqp/data/gles2/shaders/functions.html',
+        ['win', 'nvidia'], bug=478572)
+
     # Win7 / Intel failures
     self.Fail('conformance/textures/misc/' +
               'copy-tex-image-and-sub-image-2d.html',
               ['win7', 'intel'])
 
     # Win / AMD flakiness seen on new tryservers.
     # It's unfortunate that this suppression needs to be so broad, but
     # basically any test that uses readPixels is potentially flaky, and
     # it's infeasible to suppress individual failures one by one.
     self.Flaky('conformance/*', ['win', ('amd', 0x6779)], bug=491419)
 
+    # Win AMD failures
+    self.Fail('deqp/data/gles2/shaders/functions.html',
+        ['win', 'amd'], bug=478572)
+
     # Win / AMD D3D9 failures
     self.Fail('conformance/extensions/angle-instanced-arrays.html',
         ['win', 'amd', 'd3d9'], bug=475095)
     self.Fail('conformance/rendering/more-than-65536-indices.html',
         ['win', 'amd', 'd3d9'], bug=475095)
 
     # Win / D3D9 failures
     # Skipping these two tests because they're causing assertion failures.
     self.Skip('conformance/extensions/oes-texture-float-with-canvas.html',
         ['win', 'd3d9'], bug=896) # angle bug ID
@@ skipping 344 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)