Adding a few more test expectations for Android.

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 276 matching lines @@
               ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
     self.Fail('conformance/textures/image_bitmap_from_image_bitmap/' +
               'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
               ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
     self.Fail('conformance/textures/image_bitmap_from_image_bitmap/' +
               'tex-2d-rgba-rgba-unsigned_byte.html',
               ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
     self.Fail('conformance/textures/image_bitmap_from_image_bitmap/' +
               'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
               ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
+    self.Fail('conformance/textures/image_bitmap_from_image_bitmap/' +
+              'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
+              ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
+    self.Fail('conformance/uniforms/uniform-samplers-test.html',
+              ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
+    self.Fail('deqp/data/gles2/shaders/preprocessor.html',
+              ['android', ('qualcomm', 'Adreno (TM) 418')], bug=610951)
 
     # Nexus 6
     self.Fail('WebglExtension.EXT_sRGB',
               ['android', ('qualcomm', 'Adreno (TM) 420')])
     self.Fail('conformance/context/context-size-change.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
     self.Fail('conformance/extensions/oes-texture-half-float.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
     self.Fail('conformance/extensions/oes-texture-half-float-with-canvas.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
@@ skipping 11 matching lines @@
     self.Fail('conformance/glsl/bugs/qualcomm-crash.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
     self.Fail('conformance/glsl/bugs/sampler-struct-function-arg.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
     self.Fail('conformance/glsl/misc/shader-struct-scope.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
     self.Fail('conformance/glsl/misc/shader-uniform-packing-restrictions.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
     self.Fail('conformance/glsl/misc/shader-varying-packing-restrictions.html',
               ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
+    self.Fail('conformance/glsl/misc/shader-with-256-character-define.html',
+              ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
+    self.Fail('conformance/glsl/misc/' +
+              'shader-with-256-character-identifier.frag.html',
+              ['android', ('qualcomm', 'Adreno (TM) 420')], bug=611945)
 
     # Nexus 9
     self.Fail('WebglExtension.WEBGL_compressed_texture_atc',
               ['android', ('nvidia', 'NVIDIA Tegra')])
 
     # ========================
     # Conformance expectations
     # ========================
     # Fails on all platforms
     self.Fail('deqp/data/gles2/shaders/functions.html',
@@ skipping 387 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)