Revert of Temporarily disable a webgl conformance test on D3D9 only.

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 62 matching lines @@
         ['win', 'amd', 'd3d9'], bug=475095)
     self.Fail('conformance/rendering/more-than-65536-indices.html',
         ['win', 'amd', 'd3d9'], bug=475095)
 
     # Win / D3D9 failures
     # Skipping these tests because they're causing assertion failures.
     self.Skip('conformance/extensions/oes-texture-float-with-canvas.html',
         ['win', 'd3d9'], bug=896) # angle bug ID
     self.Skip('conformance/extensions/oes-texture-half-float-with-canvas.html',
         ['win', 'd3d9'], bug=896) # angle bug ID
-    self.Fail('conformance/glsl/bugs/conditional-discard-optimization.html',
-        ['win', 'd3d9'], bug=488552)
 
     # Mac failures
     self.Fail('conformance/glsl/misc/shaders-with-invariance.html',
         ['mac'], bug=421710)
 
     # Mac / Intel failures
     # Radar 13499466
     self.Fail('conformance/limits/gl-max-texture-dimensions.html',
         ['mac', 'intel'], bug=225642)
     # Radar 13499623
@@ skipping 313 matching lines @@
     self.Fail('conformance2/glsl3/misplaced-version-directive.html', bug=483282)
 
     self.Fail('conformance2/state/gl-get-calls.html', bug=483282)
     self.Fail('conformance2/state/gl-object-get-calls.html', bug=483282)
 
     self.Fail('conformance2/buffers/buffer-copying-contents.html', bug=483282)
     self.Fail('conformance2/buffers/buffer-copying-restrictions.html',
         bug=483282)
     self.Fail('conformance2/buffers/buffer-type-restrictions.html', bug=483282)
     self.Fail('conformance2/buffers/getBufferSubData.html', bug=483282)