Remove conformance[2]/textures/canvas/ suppressions on Android.

Now that the underlying bug has been fixed by crrev.com/817708, assume
that these tests run reliably on Android again.

Bug: 1095679
Tbr: backer@chromium.org
Tbr: khushalsagar@chromium.org
Change-Id: If5e6de3303027ccf9b7a8b1e49f503cbbab446d5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2478025Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818012}

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

@@ -933,48 +933,6 @@ crbug.com/1126631 [ android android-pixel-2 passthrough ] conformance2/textures/
 crbug.com/1126631 [ android android-pixel-2 passthrough ] conformance2/textures/webgl_canvas/tex-2d-rgb9_e5-rgb-half_float.html [ RetryOnFailure ]
 crbug.com/1126631 [ android android-pixel-2 passthrough ] conformance2/textures/webgl_canvas/tex-2d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html [ RetryOnFailure ]
 crbug.com/1126631 [ android android-pixel-2 passthrough ] conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance/textures/canvas/tex-2d-alpha-alpha-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-r11f_g11f_b10f-rgb-float.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-r11f_g11f_b10f-rgb-half_float.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-r16f-red-float.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-r16f-red-half_float.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-r32f-red-float.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-r8-red-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-r8ui-red_integer-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rg16f-rg-float.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rg16f-rg-half_float.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rg32f-rg-float.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rg8-rg-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rg8ui-rg_integer-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgb10_a2-rgba-unsigned_int_2_10_10_10_rev.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgb16f-rgb-float.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgb16f-rgb-half_float.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgb32f-rgb-float.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgb565-rgb-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgb565-rgb-unsigned_short_5_6_5.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgb5_a1-rgba-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgb8-rgb-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgb8ui-rgb_integer-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgb9_e5-rgb-float.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgb9_e5-rgb-half_float.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgba16f-rgba-float.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgba16f-rgba-half_float.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgba32f-rgba-float.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgba4-rgba-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgba8-rgba-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-rgba8ui-rgba_integer-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-srgb8-rgb-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-pixel-2 no-passthrough ] conformance2/textures/canvas/tex-2d-srgb8_alpha8-rgba-unsigned_byte.html [ RetryOnFailure ]
 
 # This test is failing on Android Pixel 2 and 3 (Qualcomm)
 # Seems to be an OpenGL ES bug.

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

@@ -624,14 +624,6 @@ crbug.com/1043431 [ android android-nexus-5x ] conformance/limits/gl-max-texture
 crbug.com/951628 [ android android-nexus-5x no-passthrough no-swiftshader-gl ] conformance/rendering/blending.html [ Failure ]
 crbug.com/1083320 [ android android-nexus-5x ] conformance/misc/uninitialized-test.html [ Skip ]
 crbug.com/1056830 [ android android-nexus-5x ] conformance/extensions/webgl-compressed-texture-astc.html [ Failure ]
-crbug.com/1095679 [ android android-nexus-5x no-passthrough ] conformance/textures/canvas/tex-2d-alpha-alpha-unsigned_byte.html [ Skip ]
-crbug.com/1095679 [ android android-nexus-5x no-passthrough ] conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html [ Skip ]
-crbug.com/1095679 [ android android-nexus-5x no-passthrough ] conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html [ Skip ]
-crbug.com/1095679 [ android android-nexus-5x no-passthrough ] conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-nexus-5x no-passthrough ] conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html [ Skip ]
-crbug.com/1095679 [ android android-nexus-5x no-passthrough ] conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html [ RetryOnFailure ]
-crbug.com/1095679 [ android android-nexus-5x no-passthrough ] conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html [ Skip ]
-crbug.com/1095679 [ android android-nexus-5x no-passthrough ] conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html [ Skip ]
 crbug.com/1135785 [ android android-nexus-5x no-passthrough ] conformance/textures/misc/texture-video-transparent.html [ RetryOnFailure ]
 # Timing out on this device for unknown reasons.
 crbug.com/1099148 [ android android-nexus-5x ] deqp/data/gles2/shaders/swizzles.html [ Skip ]