Update WebGL CTS expectations to skip AMD and Intel OpenGL on Windows.

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 129 matching lines @@
     self.Fail('conformance/glsl/variables/gl-pointcoord.html',
         ['win', 'opengl'], bug=1007) # angle bug ID
     self.Fail('conformance/reading/read-pixels-pack-alignment.html',
         ['win', 'opengl'], bug=1007) # angle bug ID
     self.Fail('conformance/renderbuffers/framebuffer-object-attachment.html',
         ['win', 'opengl'], bug=1007) # angle bug ID
     self.Fail('conformance/textures/gl-pixelstorei.html',
         ['win', 'opengl'], bug=1007) # angle bug ID
     self.Fail('conformance/textures/tex-image-canvas-corruption.html',
         ['win', 'opengl'], bug=1007) # angle bug ID
+    self.Fail('deqp/data/gles2/shaders/conditionals.html',
+        ['win', 'opengl'], bug=1007) # angle bug ID
+    self.Fail('deqp/data/gles2/shaders/conversions.html',
+        ['win', 'opengl'], bug=1007) # angle bug ID
+    self.Fail('deqp/data/gles2/shaders/qualification_order.html',
+        ['win', 'opengl'], bug=1007) # angle bug ID
+
+    # Skip all WebGL CTS on OpenGL+AMD/Intel
+    self.Skip('*', ['win', 'opengl', 'amd'], bug=1007) # angle bug ID
+    self.Skip('*', ['win', 'opengl', 'intel'], bug=1007) # angle bug ID
 
     # 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 329 matching lines @@
         '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)
 
     # Win only (using OpenGL).
     self.Fail('conformance2/textures/tex-storage-and-subimage-3d.html',
         ['win'], bug=483282)