Update WebGL 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_test_expectations import GpuTestExpectations
 
 # See the GpuTestExpectations class for documentation.
 
 class WebGLConformanceExpectations(GpuTestExpectations):
@@ skipping 32 matching lines @@
     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/misc/' +
-              'ternary-operators-in-global-initializers.html',
-        ['win'], bug=415694)
     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)
 
     # 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)
-    self.Fail('conformance/glsl/misc/shader-with-array-of-structs-uniform.html',
-        ['win7', 'intel', 'nvidia'], bug=373972)
 
     # Win / AMD flakiness seen on new tryservers (affecting most tests
     # randomly, must investigate ASAP)
     self.Fail('conformance/canvas/drawingbuffer-hd-dpi-test.html',
         ['win', ('amd', 0x6779)], bug=491419)
     self.Fail('conformance/context/' +
         'context-attributes-alpha-depth-stencil-antialias.html',
         ['win', ('amd', 0x6779)], bug=491419)
     self.Fail('conformance/extensions/oes-standard-derivatives.html',
         ['win', ('amd', 0x6779)], bug=491419)
@@ skipping 311 matching lines @@
         ['mac'], bug=436493)
     self.Fail('conformance/textures/texture-upload-size.html',
         ['linux'], bug=436493)
 
     ##############################################################
     # WEBGL 2 TESTS FAILURES
     ##############################################################
 
     self.Fail('deqp/data/gles3/shaders/arrays.html', bug=483282)
     self.Fail('deqp/data/gles3/shaders/constants.html', bug=483282)
-    self.Fail('deqp/data/gles3/shaders/constant_expressions.html', bug=483282)
     self.Fail('deqp/data/gles3/shaders/conversions.html', bug=483282)
-    self.Fail('deqp/data/gles3/shaders/fragdata.html', bug=483282)
     self.Fail('deqp/data/gles3/shaders/functions.html', bug=483282)
     self.Fail('deqp/data/gles3/shaders/linkage.html', bug=483282)
     self.Fail('deqp/data/gles3/shaders/preprocessor.html', bug=483282)
     self.Fail('deqp/data/gles3/shaders/qualification_order.html', bug=483282)
     self.Fail('deqp/data/gles3/shaders/scoping.html', bug=483282)
 
     self.Fail('deqp/functional/gles3/textureformat.html', bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback.html', bug=483282)
     self.Fail('deqp/functional/gles3/uniformbuffers.html', bug=483282)
 
@@ skipping 32 matching lines @@
         bug=483282)
 
     # Mac only.
     self.Fail('conformance2/renderbuffers/' +
         'multisampled-renderbuffer-initialization.html',
         ['mac'], bug=483282)
     self.Fail('conformance2/rendering/instanced-arrays.html',
         ['mac'], bug=483282)
     self.Fail('conformance2/textures/tex-storage-and-subimage-3d.html',
         ['mac'], bug=483282)