Fix WebglConformance_deqp_functional_gles3_multisample expectations

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, url_prefixes=None, is_asan=False):
     super(WebGL2ConformanceExpectations, self).__init__(
@@ skipping 695 matching lines @@
     self.Flaky('deqp/functional/gles3/texturespecification/' +
         'random_teximage2d_2d.html',
         ['linux', 'amd', 'intel'], bug=618447)
     self.Fail('conformance2/rendering/clipping-wide-points.html',
         ['linux', 'amd', 'intel'], bug=662644) # WebGL 2.0.1
 
     # Linux NVIDIA
     self.Fail('conformance2/textures/canvas_sub_rectangle/' +
         'tex-2d-r32f-red-float.html',
         ['linux', 'nvidia'], bug=713127)
+    # Explicitly specifying GT 610 to avoid conflict with Quadro P400 rule
     self.Flaky('deqp/functional/gles3/multisample.html',
-        ['linux', 'nvidia'], bug=714207)
+        ['linux', ('nvidia', 0x104a)], bug=714207)
 
     # This test is flaky both with and without ANGLE.
     self.Flaky('deqp/functional/gles3/texturespecification/' +
         'random_teximage2d_2d.html',
         ['linux', 'nvidia'], bug=618447)
     self.Fail('conformance/glsl/bugs/unary-minus-operator-float-bug.html',
         ['linux', 'nvidia'], bug=672380)
     self.Fail('conformance2/glsl3/vector-dynamic-indexing-swizzled-lvalue.html',
         ['linux', 'nvidia'], bug=709351)
     self.Fail('conformance2/textures/canvas_sub_rectangle/' +
@@ skipping 14 matching lines @@
         'tex-3d-rg8ui-rg_integer-unsigned_byte.html',
         ['linux', ('nvidia', 0xf02)], bug=680282)
     self.Flaky('conformance2/textures/image_bitmap_from_image_data/' +
         'tex-2d-srgb8-rgb-unsigned_byte.html',
         ['linux', 'nvidia'], bug=694354)
 
     # Linux NVIDIA Quadro P400
     # This test causes a lost device and then the next test fails.
     self.Skip('conformance2/rendering/blitframebuffer-size-overflow.html',
         ['linux', ('nvidia', 0x1cb3)], bug=709320)
+    self.Fail('deqp/functional/gles3/multisample.html',
+        ['linux', ('nvidia', 0x1cb3)], bug=702861)
 
     # Linux Intel
     self.Fail('conformance2/extensions/ext-color-buffer-float.html',
         ['linux', 'intel'], bug=640389)
     self.Fail('WebglExtension_EXT_disjoint_timer_query_webgl2',
         ['linux', 'intel'], bug=687210)
 
     # See https://bugs.freedesktop.org/show_bug.cgi?id=94477
     self.Skip('conformance/glsl/bugs/temp-expressions-should-not-crash.html',
         ['linux', 'intel'], bug=540543)  # GPU timeout
@@ skipping 358 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'])