Fix formats mismatch in validate_multisample_buffer_allocation

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

 # Copyright (c) 2015 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_tests.webgl_conformance_expectations import WebGLConformanceExpectations
 
 # See the GpuTestExpectations class for documentation.
 
 class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
   def __init__(self, conformance_path):
     super(WebGL2ConformanceExpectations, self).__init__(conformance_path)
@@ skipping 145 matching lines @@
         ['mac'], bug=630800)
     # self.Fail('deqp/functional/gles3/fbocompleteness.html',
     #     ['mac', ('nvidia', 0xfe9)], bug=616562)
 
     self.Fail('deqp/data/gles3/shaders/linkage.html',
         ['mac'], bug=641129)
 
     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)
 
     self.Fail('conformance2/renderbuffers/framebuffer-test.html',
         ['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)
     self.Fail('deqp/functional/gles3/framebufferblit/conversion_07.html',
         ['mac'], bug=483282)
     self.Fail('deqp/functional/gles3/framebufferblit/conversion_08.html',
         ['mac'], bug=483282)
     self.Fail('deqp/functional/gles3/framebufferblit/conversion_10.html',
         ['mac'], bug=483282)
     self.Fail('deqp/functional/gles3/framebufferblit/conversion_11.html',
@@ skipping 653 matching lines @@
     # self.Fail(page_name,
     #     ['linux', ('nvidia', 0x1), 'debug', 'opengl'])
     # self.Fail(page_name,
     #     ['win', ('nvidia', 0x1), 'debug', 'opengl'])
 
     # Conflicts if between a generic os condition and a specific version
     # self.Fail(page_name,
     #     ['xp', ('nvidia', 0x1), 'debug', 'opengl'])
     # self.Fail(page_name,
     #     ['win', ('nvidia', 0x1), 'debug', 'opengl'])