Fix formats mismatch in validate_multisample_buffer_allocation

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 5bc409d93d2eaf6688bad2c29de334d4136b0ca2..4b0501c249471f8d51376dac931b97c35065804c 100644
--- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
@@ -163,9 +163,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail('deqp/functional/gles3/uniformbuffers/random.html',
         ['mac'], bug=618464)
 
-    self.Fail('conformance2/rendering/rgb-format-support.html',
-        ['mac'], bug=483282)
-
     # This is due to "centroid out" / "in" mismatch.
     self.Fail('deqp/data/gles3/shaders/qualification_order.html',
         ['mac'], bug=483282)
@@ -174,7 +171,10 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['mac'], bug=641149)
 
     self.Fail('deqp/functional/gles3/fbomultisample*',
-        ['mac'], bug=641209)
+        ['mac', 'intel'], bug=641209)
+
+    self.Fail('deqp/functional/gles3/fbomultisample*',
+        ['mac', 'nvidia'], bug=641209)
 
     self.Fail('deqp/functional/gles3/framebufferblit/conversion_04.html',
         ['mac'], bug=483282)