Unify suppressions for several image loading tests.

Unify the suppressions between WebGL 1.0 and 2.0 for:
  conformance/more/functions/readPixelsBadArgs.html
  conformance/more/functions/texImage2DHTML.html
  conformance/more/functions/texSubImage2DHTML.html
  conformance/textures/misc/origin-clean-conformance-offscreencanvas.html
  conformance/textures/misc/origin-clean-conformance.html

Bug: 1082525, 1083100
Change-Id: Ic6cd0abb27ee434a4a5263264283a568d1d0ee23
Tbr: shrekshao@google.com
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2209687Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770803}

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

@@ -66,16 +66,15 @@ crbug.com/1082455 [ win ] conformance2/renderbuffers/multisampled-depth-renderbu
 crbug.com/1082455 [ linux ] conformance2/renderbuffers/multisampled-depth-renderbuffer-initialization.html [ Failure ]
 crbug.com/1082455 [ android ] conformance2/renderbuffers/multisampled-depth-renderbuffer-initialization.html [ Failure ]
 crbug.com/1082455 [ mac no-passthrough ] conformance2/renderbuffers/multisampled-depth-renderbuffer-initialization.html [ Failure ]
-crbug.com/1082525 [ linux intel ] conformance/textures/misc/origin-clean-conformance-offscreencanvas.html [ Failure ]
-crbug.com/1083100 [ mac ] conformance/textures/misc/origin-clean-conformance.html [ Skip ]
-crbug.com/1083100 [ win ] conformance/textures/misc/origin-clean-conformance.html [ Skip ]
-crbug.com/1083320 conformance/more/functions/readPixelsBadArgs.html [ Failure ]
+crbug.com/1082525 conformance/more/functions/readPixelsBadArgs.html [ Failure ]
+crbug.com/1082525 conformance/more/functions/texImage2DHTML.html [ RetryOnFailure ]
+crbug.com/1082525 conformance/more/functions/texSubImage2DHTML.html [ RetryOnFailure ]
+crbug.com/1082525 conformance/textures/misc/origin-clean-conformance-offscreencanvas.html [ RetryOnFailure ]
+crbug.com/1083100 conformance/textures/misc/origin-clean-conformance.html [ Skip ]
 crbug.com/1082533 [ mac intel ] conformance/textures/misc/texture-copying-and-deletion.html [ Failure ]
 crbug.com/1082533 [ win vulkan passthrough ] conformance/textures/misc/texture-copying-and-deletion.html [ Failure ]
 crbug.com/1018028 [ win vulkan ] conformance/rendering/bind-framebuffer-flush-bug.html [ Failure ]
 crbug.com/1082565 [ win intel opengl passthrough ] conformance/canvas/webgl-to-2d-canvas.html [ Failure ]
-crbug.com/1082559 conformance/more/functions/texImage2DHTML.html [ RetryOnFailure ]
-crbug.com/1082559 conformance/more/functions/texSubImage2DHTML.html [ RetryOnFailure ]
 
 crbug.com/953120 conformance/programs/program-handling.html [ Failure ]
 

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

@@ -88,12 +88,13 @@ crbug.com/867718 [ win d3d9 ] WebglExtension_EXT_disjoint_timer_query [ Failure
 crbug.com/1081973 conformance/buffers/buffer-data-and-buffer-sub-data.html [ Failure ]
 crbug.com/1082533 [ mac intel ] conformance/textures/misc/texture-copying-and-deletion.html [ Failure ]
 crbug.com/1082533 [ win vulkan passthrough ] conformance/textures/misc/texture-copying-and-deletion.html [ Failure ]
-crbug.com/1083320 conformance/more/functions/readPixelsBadArgs.html [ Failure ]
-crbug.com/1082559 conformance/more/functions/texImage2DHTML.html [ RetryOnFailure ]
-crbug.com/1082559 conformance/more/functions/texSubImage2DHTML.html [ RetryOnFailure ]
+crbug.com/1082525 conformance/more/functions/readPixelsBadArgs.html [ Failure ]
+crbug.com/1082525 conformance/more/functions/texImage2DHTML.html [ RetryOnFailure ]
+crbug.com/1082525 conformance/more/functions/texSubImage2DHTML.html [ RetryOnFailure ]
+crbug.com/1082525 conformance/textures/misc/origin-clean-conformance-offscreencanvas.html [ RetryOnFailure ]
+crbug.com/1083100 conformance/textures/misc/origin-clean-conformance.html [ Skip ]
 crbug.com/1018028 [ win vulkan ] conformance/rendering/bind-framebuffer-flush-bug.html [ Failure ]
 crbug.com/1082565 [ win intel opengl passthrough ] conformance/canvas/webgl-to-2d-canvas.html [ Failure ]
-crbug.com/1082525 conformance/textures/misc/origin-clean-conformance-offscreencanvas.html [ RetryOnFailure ]
 
 # Need to implement new error semantics
 # https://github.com/KhronosGroup/WebGL/pull/2607