WebGL 2: Update Windows expectations.

The multisample test seems to be passing on new AMD.
Also there is an NVIDIA test that still seems to fail.

BUG=617290
TBR=kbr@chromium.org,zmo@chromium.org
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel

Review-Url: https://codereview.chromium.org/2320173002
Cr-Commit-Position: refs/heads/master@{#417380}

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

@@ -45,10 +45,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Flaky('conformance2/query/occlusion-query.html', bug=603168)
     self.Fail('conformance2/misc/expando-loss-2.html', bug=483282)
 
-    # All platforms with AMD GPU.
-    self.Fail('deqp/functional/gles3/multisample.html',
-        ['amd'], bug=617290)
-
     # Windows only.
     self.Fail('conformance2/textures/misc/copy-texture-image-luma-format.html',
         ['win'], bug=638470)
@@ -57,6 +53,10 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Flaky('deqp/functional/gles3/fbomultisample*',
         ['win', 'nvidia'], bug=631317)
 
+    # This should be fixed in the latest driver.
+    self.Fail('deqp/functional/gles3/fboinvalidate/sub.html',
+        ['win', 'nvidia'], bug=1246) # ANGLE bug.
+
     # Win / AMD
 
     # Failing on old R5 230 configuration.
@@ -71,6 +71,8 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/fbomultisample.8_samples.html',
         ['win', ('amd', 0x6779)], bug=483282)
+    self.Fail('deqp/functional/gles3/multisample.html',
+        ['win', ('amd', 0x6779)], bug=617290)
 
     # Keep a separate set of failures for the R7 240, since it can use a new
     # and updated driver. The older drivers won't ever get fixes from AMD.
@@ -335,6 +337,8 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['mac', 'amd'], bug=483282)
     self.Fail('conformance2/glsl3/bool-type-cast-bug-uint-ivec-uvec.html',
         ['mac', 'amd'], bug=483282)
+    self.Fail('deqp/functional/gles3/multisample.html',
+        ['mac', 'amd'], bug=617290)
     self.Fail('deqp/functional/gles3/instancedrendering.html',
         ['mac', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/pixelbufferobject.html',
@@ -548,6 +552,8 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
 
     # Linux AMD only.
     # It looks like AMD shader compiler rejects many valid ES3 semantics.
+    self.Fail('deqp/functional/gles3/multisample.html',
+        ['linux', 'amd'], bug=617290)
     self.Fail('deqp/data/gles3/shaders/conversions.html',
         ['linux', 'amd'], bug=483282)
     self.Skip('deqp/data/gles3/shaders/arrays.html',