Update Win Intel shader expectations

Updates the expectations for WebGL2 shaderoperation tests on Windows
Intel machines:

1. Applies the skip to both UHD 630 and HD 630 machines - previously
   it only applied to UHD 630 machines.
2. Removes the d3d11 tag, as this can apparently also happen when not
   using d3d11.

TBR=ynovikov@chromium.org

Bug: 1085222
Change-Id: Ifde543f4bc069a4d5116a9656dc39326fa973ffb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2236456Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#776235}

content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt

@@ -297,13 +297,14 @@ crbug.com/766918 [ opengl linux passthrough nvidia ] conformance2/textures/image
 crbug.com/965648 [ opengl linux passthrough nvidia ] deqp/functional/gles3/shaderstruct.html [ RetryOnFailure ]
 
 # Flaky on Windows 10 1909 Intel HD 630/UHD 630 GPUs w/ 26.20.100.8141
-crbug.com/1085222 [ win10 intel-0x3e92 d3d11 ] deqp/functional/gles3/shaderoperator/binary_operator_* [ Skip ]
-crbug.com/1085222 [ win10 intel-0x3e92 d3d11 ] deqp/functional/gles3/shaderoperator/unary_operator_01.html [ Skip ]
-crbug.com/1085222 [ win10 intel-0x3e92 d3d11 ] deqp/functional/gles3/shaderoperator/unary_operator_02.html [ Skip ]
-crbug.com/1085222 [ win10 intel-0x5912 d3d11 ] deqp/functional/gles3/shaderoperator/binary_operator_00.html [ RetryOnFailure ]
-crbug.com/1085222 [ win10 intel-0x5912 d3d11 ] deqp/functional/gles3/shaderoperator/binary_operator_01.html [ RetryOnFailure ]
-crbug.com/1085222 [ win10 intel-0x5912 d3d11 ] deqp/functional/gles3/shaderoperator/unary_operator_01.html [ RetryOnFailure ]
-crbug.com/1085222 [ win10 intel-0x5912 d3d11 ] deqp/functional/gles3/shaderoperator/unary_operator_02.html [ RetryOnFailure ]
+crbug.com/1085222 [ win10 intel-0x3e92 ] deqp/functional/gles3/shaderoperator/binary_operator_* [ Skip ]
+crbug.com/1085222 [ win10 intel-0x3e92 ] deqp/functional/gles3/shaderoperator/unary_operator_01.html [ Skip ]
+crbug.com/1085222 [ win10 intel-0x3e92 ] deqp/functional/gles3/shaderoperator/unary_operator_02.html [ Skip ]
+crbug.com/1085222 [ win10 intel-0x5912 ] deqp/functional/gles3/shaderoperator/binary_operator_* [ Skip ]
+crbug.com/1085222 [ win10 intel-0x5912 ] deqp/functional/gles3/shaderoperator/unary_operator_01.html [ Skip ]
+crbug.com/1085222 [ win10 intel-0x5912 ] deqp/functional/gles3/shaderoperator/unary_operator_02.html [ Skip ]
+
+# Flaky direct composition failure on Windows 10 1909 Intel UHD 630 GPUs w/ 26.20.100.8141
 crbug.com/1087993 [ win10 intel-0x5912 d3d11 ] conformance2/textures/image_data/tex-2d-rgb8ui-rgb_integer-unsigned_byte.html [ RetryOnFailure ]
 crbug.com/1087993 [ win10 intel-0x5912 d3d11 ] conformance2/textures/image_data/tex-2d-srgb8_alpha8-rgba-unsigned_byte.html [ RetryOnFailure ]