WebGL2: Update Windows test expectations.

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

Index: content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
diff --git a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
index d247801361d6c8d88df64c3e4d1f2adf7ff0d4e8..bada7aa3dae3255f158ff5df7827cc37d112edd4 100644
--- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
@@ -118,20 +118,24 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
 
     self.Fail('conformance2/glsl3/array-in-complex-expression.html',
         ['win'], bug=483282)
-    self.Skip('conformance2/reading/read-pixels-pack-parameters.html',
-        ['win'], bug=483282)
 
-    self.Fail('deqp/functional/gles3/fbomultisample*',
-        ['win'], bug=483282)
+    self.Fail('deqp/functional/gles3/transformfeedback/*.html',
+        ['win'], bug=626068)
 
-    self.Fail('deqp/functional/gles3/fboinvalidate/sub.html',
-        ['win'], bug=483282)
     self.Fail('deqp/functional/gles3/fboinvalidate/whole.html',
         ['win'], bug=624506)
 
     self.Fail('deqp/functional/gles3/textureformat/compressed_cube.html',
         ['win'], bug=614573)
 
+    # ANGLE bug id
+    self.Fail('deqp/functional/gles3/fbomultisample*',
+        ['win'], bug=1246)
+    self.Fail('deqp/functional/gles3/fboinvalidate/sub.html',
+        ['win'], bug=1246)
+    self.Skip('conformance2/reading/read-pixels-pack-parameters.html',
+        ['win'], bug=1268)
+
     # Windows 8 only.
 
     self.Flaky('deqp/functional/gles3/buffercopy.html', ['win8'], bug=587601)
@@ -141,8 +145,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['win', 'nvidia'], bug=483282)
     self.Fail('deqp/functional/gles3/framebufferblit/rect_05.html',
         ['win', 'nvidia'], bug=483282)
-    self.Fail('deqp/functional/gles3/transformfeedback/*.html',
-        ['win', 'nvidia'], bug=483282)
 
     # Win / AMD
     self.Fail('deqp/functional/gles3/texturespecification/' +
@@ -166,9 +168,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail('deqp/functional/gles3/textureshadow/cube*',
         ['win', ('amd', 0x6779)], bug=483282)
 
-    self.Fail('deqp/functional/gles3/transformfeedback/*.html',
-        ['win', ('amd', 0x6779)], bug=483282)
-
     # It's unfortunate that these suppressions need 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.
@@ -226,8 +225,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['win', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/textureshadow/2d_array_*.html',
         ['win', 'intel'], bug=483282)
-    self.Flaky('deqp/functional/gles3/transformfeedback/*.html',
-        ['win', 'intel'], bug=626068)
 
     # It's unfortunate that these suppressions need to be so broad, but it
     # looks like the D3D11 device can be lost spontaneously on this