Improve precision of uninitialized-test-2.html suppression.

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 3d9b8cac8175e4d8453e50abb2e8fd68b720b080..5ce63be413f5299e3176222453a76abe7d12eb8e 100644
--- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
@@ -43,7 +43,14 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     # All platforms.
     self.Flaky('conformance2/query/occlusion-query.html', bug=603168)
     self.Fail('conformance2/glsl3/tricky-loop-conditions.html', bug=483282)
-    self.Flaky('conformance2/misc/uninitialized-test-2.html', bug=671791)
+
+    # This next one fails reliably on Linux AMD and is flaky everywhere
+    # else. Unfortunately, this means the expectation needs to be
+    # complicated to avoid collisions (and unit test failures).
+    self.Flaky('conformance2/misc/uninitialized-test-2.html',
+        ['win', 'mac', 'chromeos', 'android'], bug=671791)
+    self.Flaky('conformance2/misc/uninitialized-test-2.html',
+        ['linux', 'intel', 'nvidia'], bug=671791)
     self.Fail('conformance2/rendering/depth-stencil-feedback-loop.html',
         bug=660844) # WebGL 2.0.1
     self.Fail('conformance2/rendering/rendering-sampling-feedback-loop.html',
@@ -619,6 +626,8 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail('deqp/functional/gles3/transformfeedback/array_separate*.html',
         ['linux', 'amd'], bug=483282)
 
+    self.Fail('conformance2/misc/uninitialized-test-2.html',
+        ['linux', 'amd'], bug=483282)
     self.Fail('conformance2/rendering/blitframebuffer-filter-srgb.html',
         ['linux', 'amd'], bug=634525)
     self.Fail('conformance2/rendering/blitframebuffer-outside-readbuffer.html',