Update WebGL / WebGL2 expectations on Windows Intel HD530 / HD630

BUG=chromium:680797, chromium:737002

Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;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
Change-Id: I9be5bbc30d214014a4e5e8a75d17560e4129493b
Reviewed-on: https://chromium-review.googlesource.com/651007
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#500026}

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

@@ -187,29 +187,12 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['win', 'intel', 'd3d11'], bug=666392)
 
     # Win 10 / Intel
-    self.Fail('conformance/rendering/clear-after-copyTexImage2D.html',
-        ['win10', 'intel'], bug=737002)
     self.Fail('deqp/functional/gles3/fbocolorbuffer/clear.html',
         ['win10', 'intel', 'd3d11', 'no_passthrough'], bug=483282)
 
     # Intel HD 530
     self.Fail('conformance2/textures/misc/angle-stuck-depth-textures.html',
         ['win', 'intel', 'no_passthrough', 'd3d11'], bug=680797)
-    self.Fail('deqp/functional/gles3/fboinvalidate/format_00.html',
-        ['win', 'intel', 'd3d11'], bug=680797)
-    self.Fail('deqp/functional/gles3/fboinvalidate/format_01.html',
-        ['win', 'intel', 'd3d11'], bug=680797)
-    self.Fail('deqp/functional/gles3/fboinvalidate/format_02.html',
-        ['win', 'intel', 'd3d11'], bug=680797)
-    self.Fail('deqp/functional/gles3/framebufferblit/' +
-        'default_framebuffer_03.html',
-        ['win', 'intel', 'd3d11'], bug=680797)
-    self.Fail('deqp/functional/gles3/framebufferblit/' +
-        'default_framebuffer_04.html',
-        ['win', 'intel', 'd3d11'], bug=680797)
-    self.Fail('deqp/functional/gles3/framebufferblit/' +
-        'default_framebuffer_06.html',
-        ['win', 'intel', 'd3d11'], bug=680797)
 
     # It's unfortunate that these suppressions need to be so broad, but it
     # looks like the D3D11 device can be lost spontaneously on this

content/test/gpu/gpu_tests/webgl_conformance_expectations.py

@@ -253,10 +253,6 @@ class WebGLConformanceExpectations(GpuTestExpectations):
         'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
         ['win10', ('nvidia', 0x1cb3)], bug=728670)
 
-    # Win10 / Intel failures
-    self.Fail('conformance/rendering/clear-after-copyTexImage2D.html',
-        ['win10', 'intel'], bug=737002)
-
     # Win7 / Intel failures
     self.Fail('conformance/textures/misc/' +
               'copy-tex-image-and-sub-image-2d.html',