Expand Linux AMD failure suppressions to cover R7 240.

content/test/gpu/gpu_tests/webgl_conformance_expectations.py

 # Copyright (c) 2013 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.
 import os
 
 from gpu_tests.gpu_test_expectations import GpuTestExpectations
 
 # See the GpuTestExpectations class for documentation.
 
 class WebGLConformanceExpectations(GpuTestExpectations):
@@ skipping 664 matching lines @@
               ['linux', 'nvidia'], bug=544989) # Too flaky to retry
     self.Flaky('conformance/extensions/oes-element-index-uint.html',
                ['linux', 'nvidia'], bug=524144)
     self.Flaky('conformance/textures/image/' +
                'tex-2d-rgb-rgb-unsigned_byte.html',
                ['linux', 'nvidia'], bug=596622)
     # AMD
     self.Flaky('conformance/more/functions/uniformi.html',
                ['linux', 'amd'], bug=550989)
 
-    # AMD Radeon 6450
+    # AMD Radeon 6450 and/or R7 240
     self.Fail('conformance/extensions/angle-instanced-arrays.html',
-        ['linux', ('amd', 0x6779)], bug=479260)
+        ['linux', 'amd'], bug=479260)
     self.Flaky('conformance/extensions/ext-texture-filter-anisotropic.html',
         ['linux', ('amd', 0x6779)], bug=436212)
     self.Flaky('conformance/glsl/misc/shader-struct-scope.html',
         ['linux', ('amd', 0x6779)], bug=436212)
     self.Flaky('conformance/glsl/misc/struct-nesting-of-variable-names.html',
         ['linux', ('amd', 0x6779)], bug=436212)
     self.Flaky('conformance/rendering/point-size.html',
         ['linux', ('amd', 0x6779)], bug=436212)
     self.Flaky('conformance/textures/misc/texture-sub-image-cube-maps.html',
         ['linux', ('amd', 0x6779)], bug=436212)
     self.Flaky('conformance/more/functions/uniformf.html',
         ['linux', ('amd', 0x6779)], bug=436212)
     self.Fail('conformance/glsl/misc/shaders-with-invariance.html',
-        ['linux', ('amd', 0x6779)], bug=479952)
+        ['linux', 'amd'], bug=479952)
     self.Flaky('conformance/textures/misc/texture-mips.html',
         ['linux', ('amd', 0x6779)], bug=479981)
     self.Flaky('conformance/textures/misc/texture-size-cube-maps.html',
         ['linux', ('amd', 0x6779)], bug=479983)
     self.Flaky('conformance/uniforms/uniform-default-values.html',
         ['linux', ('amd', 0x6779)], bug=482013)
     self.Flaky('conformance/glsl/samplers/glsl-function-texture2dlod.html',
         ['linux', ('amd', 0x6779)], bug=436212)
     self.Flaky('conformance/glsl/samplers/glsl-function-texture2dprojlod.html',
         ['linux', ('amd', 0x6779)], bug=436212)
@@ skipping 242 matching lines @@
     self.Fail('conformance/textures/misc/texture-npot.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/textures/misc/texture-npot-video.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/textures/misc/texture-size.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/uniforms/gl-uniform-arrays.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Skip('conformance/uniforms/uniform-default-values.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)