Update more WebGL conformance tests on bots.

content/test/gpu/gpu_tests/webgl_conformance_expectations.py

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 import os
 
 from gpu_tests.gpu_test_expectations import GpuTestExpectations
 
 # See the GpuTestExpectations class for documentation.
 
 class WebGLConformanceExpectations(GpuTestExpectations):
@@ skipping 69 matching lines @@
         ['android'])
     self.Fail('WebglExtension_WEBGL_compressed_texture_pvrtc',
         ['android'])
     self.Fail('WebglExtension_WEBGL_compressed_texture_s3tc',
         ['android'])
     self.Fail('WebglExtension_WEBGL_depth_texture',
         ['android'])
     self.Fail('WebglExtension_WEBGL_draw_buffers',
         ['android'])
 
-    # Nexus 6 (Adreno 420) and 6P (Adreno 430)
-
     # ========================
     # Conformance expectations
     # ========================
     # Fails on all platforms
 
     # Need to add detection of feedback loops with multiple render targets.
     self.Fail('conformance/extensions/webgl-draw-buffers-feedback-loop.html',
         bug=1619) # angle bug ID
 
     # We need to add WebGL 1 check in command buffer that format/type from
@@ skipping 287 matching lines @@
                ['linux'], bug=627525)
     self.Flaky('conformance/textures/video/' +
                'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
                ['linux'], bug=627525)
     self.Flaky('conformance/textures/video/' +
                'tex-2d-rgb-rgb-unsigned_byte.html',
                ['linux'], bug=627525)
     self.Flaky('conformance/textures/video/' +
                'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
                ['linux'], bug=627525)
-    self.Fail('conformance/extensions/webgl-compressed-texture-etc.html',
-        bug=679678)
     self.Fail('conformance/extensions/webgl-compressed-texture-astc.html',
         ['linux', 'intel'], bug=680675)
 
     # NVIDIA
     self.Flaky('conformance/extensions/oes-element-index-uint.html',
                ['linux', 'nvidia'], bug=524144)
     self.Flaky('conformance/textures/image/' +
                'tex-2d-rgb-rgb-unsigned_byte.html',
                ['linux', 'nvidia'], bug=596622)
     self.Fail('conformance/glsl/bugs/unary-minus-operator-float-bug.html',
@@ skipping 114 matching lines @@
     self.Fail('deqp/data/gles2/shaders/linkage.html',
         ['android', ('qualcomm', 'Adreno (TM) 330')], bug=478572)
     self.Fail('WebglExtension_OES_texture_float_linear',
         ['android', ('qualcomm', 'Adreno (TM) 330')])
     self.Fail('conformance/more/functions/vertexAttribPointerBadArgs.html',
         ['android', ('qualcomm', 'Adreno (TM) 330')], bug=678850)
     self.Fail('conformance/attribs/gl-vertexattribpointer.html',
         ['android', ('qualcomm', 'Adreno (TM) 330')], bug=678850)
 
     # Nexus 5X
-    self.Fail('conformance/extensions/oes-texture-float-with-image-data.html',
-        ['android', ('qualcomm', 'Adreno (TM) 418')], bug=609883)
-    self.Fail('conformance/extensions/oes-texture-float-with-image.html',
-        ['android', ('qualcomm', 'Adreno (TM) 418')], bug=609883)
-    self.Fail('conformance/extensions/oes-texture-half-float-with-canvas.html',
-        ['android', ('qualcomm', 'Adreno (TM) 418')], bug=609883)
-    self.Fail('conformance/extensions/' +
-        'oes-texture-half-float-with-image-data.html',
-        ['android', ('qualcomm', 'Adreno (TM) 418')], bug=609883)
-    self.Fail('conformance/extensions/oes-texture-half-float-with-image.html',
-        ['android', ('qualcomm', 'Adreno (TM) 418')], bug=609883)
     # This one is causing intermittent timeouts on the device, and it
     # looks like when that happens, the next test also always times
     # out. Skip it for now until it's fixed and running reliably.
     self.Skip('conformance/extensions/oes-texture-half-float-with-video.html',
         ['android', ('qualcomm', 'Adreno (TM) 418')], bug=609883)
     self.Fail('conformance/extensions/webgl-compressed-texture-atc.html',
         ['android', ('qualcomm', 'Adreno (TM) 418')], bug=609883)
     self.Fail('conformance/glsl/bugs/sampler-struct-function-arg.html',
         ['android', ('qualcomm', 'Adreno (TM) 418')], bug=609883)
     # This test is skipped because it is crashing the GPU process.
     self.Skip('conformance/glsl/misc/shader-with-non-reserved-words.html',
         ['android', ('qualcomm', 'Adreno (TM) 418')], bug=609883)
-    self.Fail('conformance/textures/misc/' +
-        'tex-image-and-sub-image-2d-with-array-buffer-view.html',
-        ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
-    self.Fail('conformance/textures/canvas/*',
-        ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
-    self.Fail('conformance/textures/image/*',
-        ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
-    self.Fail('conformance/textures/image_bitmap_from_canvas/*',
-        ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
-    self.Fail('conformance/textures/image_bitmap_from_blob/*',
-        ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
-    self.Fail('conformance/textures/image_bitmap_from_image/*',
-        ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
-    self.Fail('conformance/textures/image_bitmap_from_image_bitmap/*',
-        ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
-    self.Fail('conformance/textures/image_bitmap_from_image_data/*',
-        ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
-    self.Fail('conformance/textures/image_data/*',
-        ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
-    self.Fail('conformance/textures/svg_image/*',
-        ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
-    self.Fail('conformance/textures/video/*',
-        ['android', 'android-content-shell', 'android-chromium',
-         ('qualcomm', 'Adreno (TM) 418')], bug=610951)
-    self.Fail('conformance/textures/webgl_canvas/*',
-        ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
     self.Fail('conformance/uniforms/uniform-samplers-test.html',
         ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
     self.Fail('WebglExtension_EXT_sRGB',
         ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
 
     # Nexus 6 (Adreno 420) and 6P (Adreno 430)
     self.Fail('conformance/context/' +
         'context-attributes-alpha-depth-stencil-antialias.html',
         ['android', ('qualcomm', 'Adreno (TM) 420')], bug=499555)
     self.Fail('conformance/context/context-size-change.html',
@@ skipping 163 matching lines @@
     self.Fail('conformance/textures/misc/texture-npot.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/textures/misc/texture-npot-video.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/textures/misc/texture-size.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Fail('conformance/uniforms/gl-uniform-arrays.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)
     self.Skip('conformance/uniforms/uniform-default-values.html',
         ['chromeos', ('intel', 0xa011)], bug=375554)