WebGL: Update AMD test expectations.

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 1803d1218cd5572c8b13dad822263b5bdb52e3b3..ccbb89bcaf6bb6b99c7569af3eabafffa93baf32 100644
--- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
@@ -69,21 +69,21 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['win', 'amd'], bug=638323)
     self.Fail('deqp/functional/gles3/textureshadow/cube*',
         ['win', 'amd'], bug=638323)
-
-    # Failing on old R5 230 configuration.
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'texstorage2d_format_depth_stencil.html',
-        ['win', ('amd', 0x6779)], bug=614178)
+        ['win', 'amd'], bug=614178)
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'texstorage3d_format_depth_stencil.html',
-        ['win', ('amd', 0x6779)], bug=614178)
+        ['win', 'amd'], bug=614178)
     self.Fail('deqp/functional/gles3/shadertexturefunction/texture.html',
-        ['win', ('amd', 0x6779)], bug=483282)
+        ['win', 'amd'], bug=483282)
+    self.Fail('deqp/functional/gles3/shadertexturefunction/texturesize.html',
+        ['win', 'amd'], bug=483282)
+
+    # Failing on old R5 230 configuration.
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texelfetchoffset.html',
         ['win', ('amd', 0x6779)], bug=483282)
-    self.Fail('deqp/functional/gles3/shadertexturefunction/texturesize.html',
-        ['win', ('amd', 0x6779)], bug=483282)
 
     self.Fail('deqp/functional/gles3/transformfeedback/*',
         ['win', ('amd', 0x6779)], bug=626068)
@@ -97,10 +97,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     # and updated driver. The older drivers won't ever get fixes from AMD.
     self.Fail('deqp/functional/gles3/framebufferblit/depth_stencil.html',
         ['win', ('amd', 0x6613)], bug=638323)
-    self.Fail('deqp/functional/gles3/shadertexturefunction/texture.html',
-        ['win', ('amd', 0x6613)], bug=638323)
-    self.Fail('deqp/functional/gles3/shadertexturefunction/texturesize.html',
-        ['win', ('amd', 0x6613)], bug=638323)
     self.Fail('deqp/functional/gles3/texturefiltering/2d_array*',
         ['win', ('amd', 0x6613)], bug=638323)
     self.Fail('deqp/functional/gles3/texturefiltering/cube*',
@@ -109,12 +105,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         'teximage2d_depth.html',
         ['win', ('amd', 0x6613)], bug=638323)
     self.Fail('deqp/functional/gles3/texturespecification/'
-        'texstorage2d_format_depth_stencil.html',
-        ['win', ('amd', 0x6613)], bug=638323)
-    self.Fail('deqp/functional/gles3/texturespecification/'
-        'texstorage3d_format_depth_stencil.html',
-        ['win', ('amd', 0x6613)], bug=638323)
-    self.Fail('deqp/functional/gles3/texturespecification/'
         'texsubimage2d_depth.html',
         ['win', ('amd', 0x6613)], bug=638323)