WebGL: Fix AMD R7 texture shadow expectations.

These were using an incorrect path to the shadow tests.

BUG=638323
TBR=kbr@chromium.org,zmo@chromium.org
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel

Review-Url: https://codereview.chromium.org/2252083002
Cr-Commit-Position: refs/heads/master@{#412544}

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

@@ -63,6 +63,14 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['win', 'nvidia'], bug=631317)
 
     # Win / AMD
+
+    # Fail on all AMD configurations
+    self.Fail('deqp/functional/gles3/textureshadow/2d*',
+        ['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)
@@ -77,11 +85,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail('deqp/functional/gles3/shadertexturefunction/texturesize.html',
         ['win', ('amd', 0x6779)], bug=483282)
 
-    self.Fail('deqp/functional/gles3/textureshadow/2d*',
-        ['win', ('amd', 0x6779)], bug=483282)
-    self.Fail('deqp/functional/gles3/textureshadow/cube*',
-        ['win', ('amd', 0x6779)], bug=483282)
-
     self.Fail('deqp/functional/gles3/transformfeedback/*',
         ['win', ('amd', 0x6779)], bug=626068)
 
@@ -102,15 +105,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['win', ('amd', 0x6613)], bug=638323)
     self.Fail('deqp/functional/gles3/texturefiltering/cube*',
         ['win', ('amd', 0x6613)], bug=638323)
-    self.Fail('deqp/functional/gles3/texturefiltering/'
-        'textureshadow_2d_array_nearest_mipmap_nearest_*',
-        ['win', ('amd', 0x6613)], bug=638323)
-    self.Fail('deqp/functional/gles3/texturefiltering/'
-        'textureshadow_2d_linear_mipmap*',
-        ['win', ('amd', 0x6613)], bug=638323)
-    self.Fail('deqp/functional/gles3/texturefiltering/'
-        'textureshadow_2d_nearest_mipmap_nearest*',
-        ['win', ('amd', 0x6613)], bug=638323)
     self.Fail('deqp/functional/gles3/texturespecification/'
         'teximage2d_depth.html',
         ['win', ('amd', 0x6613)], bug=638323)