Limit test suppressions to D3D9 again.

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 gpu_test_expectations import GpuTestExpectations
 
 # See the GpuTestExpectations class for documentation.
 
 class WebGLConformanceExpectations(GpuTestExpectations):
   def SetExpectations(self):
@@ skipping 36 matching lines @@
     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)
 
     # Win8 / NVIDIA failures
     self.Fail('conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html',
         ['win', 'nvidia'], bug=459265)
 
     # Win / AMD failures
-    # TODO(jmadill): only fail on D3D9 with ANGLE bug ID 839
     self.Fail('conformance/textures/texparameter-test.html',
-        ['win', 'amd'], bug=454906)
+        ['win', 'amd', 'd3d9'], bug=839) # angle bug ID
 
     # Win / D3D9 failures
-    # TODO(jmadill): only fail on D3D9 with ANGLE bug ID 896
+    # Skipping these tests because they're causing assertion failures.
     self.Skip('conformance/extensions/oes-texture-float-with-canvas.html',
-        ['win'], bug=454906)
+        ['win', 'd3d9'], bug=896) # angle bug ID
     self.Skip('conformance/extensions/oes-texture-half-float-with-canvas.html',
-        ['win'], bug=454906)
+        ['win', 'd3d9'], bug=896) # angle bug ID
 
     # Mac / Intel failures
     # Radar 13499466
     self.Fail('conformance/limits/gl-max-texture-dimensions.html',
         ['mac', 'intel'], bug=225642)
     # Radar 13499623
     self.Fail('conformance/textures/texture-size.html',
         ['mac', 'intel'], bug=225642)
 
     # Mac / Intel HD 3000 failures
@@ skipping 223 matching lines @@
     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)
 
     # Flaky on Mac & Linux
     self.Fail('conformance/textures/texture-upload-size.html',
         ['mac'], bug=436493)
     self.Fail('conformance/textures/texture-upload-size.html',
         ['linux'], bug=436493)