Revert of Roll WebGL conformance tests.

Revert of Roll WebGL conformance tests. (patchset #2 id:20001 of https://codereview.chromium.org/1675103002/ )

Reason for revert:
Sorry, looks like this roll introduced some failures on Nexus 6: https://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus%206%29/builds/6300

[  FAILED  ]  WebglConformance.conformance_textures_image_bitmap_tex_image_and_sub_image_2d_with_image_bitmap_rgb_rgb_unsigned_byte
[  FAILED  ]  WebglConformance.conformance_textures_image_bitmap_tex_image_and_sub_image_2d_with_image_bitmap_rgb_rgb_unsigned_short_5_6_5
[  FAILED  ]  WebglConformance.conformance_textures_image_bitmap_tex_image_and_sub_image_2d_with_image_bitmap_rgba_rgba_unsigned_byte
[  FAILED  ]  WebglConformance.conformance_textures_image_bitmap_tex_image_and_sub_image_2d_with_image_bitmap_rgba_rgba_unsigned_short_4_4_4_4
[  FAILED  ]  WebglConformance.conformance_textures_image_bitmap_tex_image_and_sub_image_2d_with_image_bitmap_rgba_rgba_unsigned_short_5_5_5_1

Original issue's description:
> Roll WebGL conformance tests.
> 
> BUG=
> TEST=webgl_conformance, webgl2_conformance
> TBR=kbr@chromium.org,bajones@chromium.org
> NOTRY=true
> 
> Committed: https://crrev.com/38cf26e851dc15585565f95c8153dd1531dcd80e
> Cr-Commit-Position: refs/heads/master@{#374061}

TBR=bajones@chromium.org,kbr@chromium.org,zmo@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

[flackr, 2016-02-08 14:17:03]

Created Revert of Roll WebGL conformance tests.

[commit-bot: I haz the power, 2016-02-08 14:17:28]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1676283002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1676283002/1

[commit-bot: I haz the power, 2016-02-08 14:18:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-02-08 14:18:15]

Failed to apply patch for
content/test/gpu/gpu_tests/webgl2_conformance_expectations.py:
While running git apply --index -3 -p1;
  error: patch failed:
content/test/gpu/gpu_tests/webgl2_conformance_expectations.py:222
  Falling back to three-way merge...
  Applied patch to
'content/test/gpu/gpu_tests/webgl2_conformance_expectations.py' with conflicts.
  U content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

Patch:       content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
Index: content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
diff --git a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
index
8b3fa9e4cdae9df82617b4956f190d50e41fe197..70e76479fd8c84bf118c3ff37f88605d1b551a6d
100644
--- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
@@ -79,18 +79,14 @@
 
     self.Fail('conformance2/glsl3/array-complex-indexing.html', bug=483282)
     self.Fail('conformance2/glsl3/forbidden-operators.html', bug=483282)
+    self.Fail('conformance2/samplers/sampler-drawing-test.html', bug=483282)
     self.Fail('conformance2/state/gl-object-get-calls.html', bug=483282)
     # Note that this test fails on ['win', 'intel'] with bug=483282
     self.Fail('conformance2/buffers/uniform-buffers.html', bug=577368)
 
-    # The following two entries are due to validation of TEXTURE_3D target on
-    # 2D texture calls.
-    # compressed-tex-image.html fails on Mac with bug ID 565438.
-    self.Fail('conformance2/textures/misc/compressed-tex-image.html',
-        bug=483282)
-    # tex-input-validation fails on Win and ['mac', ('nvidia', 0xfe9)].
-    self.Fail('conformance2/textures/misc/tex-input-validation.html',
-        bug=483282)
+    # Remove the following after roll in ToT WebGL conformance tests.
+    self.Fail('conformance2/reading/read-pixels-into-pixel-pack-buffer.html',
+        ['mac', 'linux'], bug=570453)
 
     # Windows only.
     self.Fail('conformance2/textures/canvas/tex-image-and-sub-image-2d' +
@@ -213,6 +209,8 @@
     self.Skip('conformance2/reading/read-pixels-pack-parameters.html',
         ['win'], bug=483282)
     self.Fail('conformance2/textures/misc/gl-get-tex-parameter.html',
+        ['win'], bug=483282)
+    self.Fail('conformance2/textures/misc/tex-input-validation.html',
         ['win'], bug=483282)
     self.Skip('conformance2/textures/misc/tex-mipmap-levels.html',
         ['win'], bug=483282)
@@ -222,8 +220,6 @@
         ['win'], bug=1198) # angle bug ID
     self.Skip('conformance2/reading/read-pixels-into-pixel-pack-buffer.html',
         ['win'], bug=1266) # angle bug ID
-    self.Fail('conformance2/textures/misc/copy-texture-image.html',
-        ['win'], bug=577144)
 
     # Windows 8 only.
     self.Fail('conformance2/textures/image_data/tex-image-and-sub-image-2d' +
@@ -282,10 +278,6 @@
         '-with-canvas-rgba8-rgba-unsigned_byte.html',
         ['win', 'debug'], bug=542901)
 
-    # Windows AMD/ATI only.
-    self.Fail('deqp/functional/gles3/fbostencilbuffer.html',
-        ['win', 'amd'], bug=483282)
-
     # Mac only.
     self.Skip('deqp/data/gles3/shaders/qualification_order.html',
         ['mac'], bug=483282)
@@ -335,13 +327,15 @@
         ['mac'], bug=483282)
     self.Fail('conformance2/renderbuffers/readbuffer.html',
         ['mac'], bug=570453)
+    self.Fail('conformance2/textures/misc/compressed-tex-image.html',
+        ['mac'], bug=565438)
     self.Fail('conformance2/textures/misc/tex-mipmap-levels.html',
         ['mac'], bug=483282)
-    self.Fail('conformance2/textures/misc/copy-texture-image.html',
-        ['mac'], bug=577144)
 
     # Mac Retina NVIDIA
     self.Fail('conformance2/rendering/draw-buffers.html',
+        ['mac', ('nvidia', 0xfe9)], bug=483282)
+    self.Fail('conformance2/textures/misc/tex-input-validation.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
 
     # Linux only.

[commit-bot: I haz the power, 2016-02-08 14:18:34]

The CQ bit was unchecked by commit-bot@chromium.org

[Zhenyao Mo, 2016-02-09 17:14:06]

On 2016/02/08 14:18:15, commit-bot: I haz the power wrote:
> Failed to apply patch for
> content/test/gpu/gpu_tests/webgl2_conformance_expectations.py:
> While running git apply --index -3 -p1;
>   error: patch failed:
> content/test/gpu/gpu_tests/webgl2_conformance_expectations.py:222
>   Falling back to three-way merge...
>   Applied patch to
> 'content/test/gpu/gpu_tests/webgl2_conformance_expectations.py' with
conflicts.
>   U content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
> 
> Patch:       content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
> Index: content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
> diff --git a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
> b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
> index
>
8b3fa9e4cdae9df82617b4956f190d50e41fe197..70e76479fd8c84bf118c3ff37f88605d1b551a6d
> 100644
> --- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
> +++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
> @@ -79,18 +79,14 @@
>  
>      self.Fail('conformance2/glsl3/array-complex-indexing.html', bug=483282)
>      self.Fail('conformance2/glsl3/forbidden-operators.html', bug=483282)
> +    self.Fail('conformance2/samplers/sampler-drawing-test.html', bug=483282)
>      self.Fail('conformance2/state/gl-object-get-calls.html', bug=483282)
>      # Note that this test fails on ['win', 'intel'] with bug=483282
>      self.Fail('conformance2/buffers/uniform-buffers.html', bug=577368)
>  
> -    # The following two entries are due to validation of TEXTURE_3D target on
> -    # 2D texture calls.
> -    # compressed-tex-image.html fails on Mac with bug ID 565438.
> -    self.Fail('conformance2/textures/misc/compressed-tex-image.html',
> -        bug=483282)
> -    # tex-input-validation fails on Win and ['mac', ('nvidia', 0xfe9)].
> -    self.Fail('conformance2/textures/misc/tex-input-validation.html',
> -        bug=483282)
> +    # Remove the following after roll in ToT WebGL conformance tests.
> +    self.Fail('conformance2/reading/read-pixels-into-pixel-pack-buffer.html',
> +        ['mac', 'linux'], bug=570453)
>  
>      # Windows only.
>      self.Fail('conformance2/textures/canvas/tex-image-and-sub-image-2d' +
> @@ -213,6 +209,8 @@
>      self.Skip('conformance2/reading/read-pixels-pack-parameters.html',
>          ['win'], bug=483282)
>      self.Fail('conformance2/textures/misc/gl-get-tex-parameter.html',
> +        ['win'], bug=483282)
> +    self.Fail('conformance2/textures/misc/tex-input-validation.html',
>          ['win'], bug=483282)
>      self.Skip('conformance2/textures/misc/tex-mipmap-levels.html',
>          ['win'], bug=483282)
> @@ -222,8 +220,6 @@
>          ['win'], bug=1198) # angle bug ID
>      self.Skip('conformance2/reading/read-pixels-into-pixel-pack-buffer.html',
>          ['win'], bug=1266) # angle bug ID
> -    self.Fail('conformance2/textures/misc/copy-texture-image.html',
> -        ['win'], bug=577144)
>  
>      # Windows 8 only.
>      self.Fail('conformance2/textures/image_data/tex-image-and-sub-image-2d' +
> @@ -282,10 +278,6 @@
>          '-with-canvas-rgba8-rgba-unsigned_byte.html',
>          ['win', 'debug'], bug=542901)
>  
> -    # Windows AMD/ATI only.
> -    self.Fail('deqp/functional/gles3/fbostencilbuffer.html',
> -        ['win', 'amd'], bug=483282)
> -
>      # Mac only.
>      self.Skip('deqp/data/gles3/shaders/qualification_order.html',
>          ['mac'], bug=483282)
> @@ -335,13 +327,15 @@
>          ['mac'], bug=483282)
>      self.Fail('conformance2/renderbuffers/readbuffer.html',
>          ['mac'], bug=570453)
> +    self.Fail('conformance2/textures/misc/compressed-tex-image.html',
> +        ['mac'], bug=565438)
>      self.Fail('conformance2/textures/misc/tex-mipmap-levels.html',
>          ['mac'], bug=483282)
> -    self.Fail('conformance2/textures/misc/copy-texture-image.html',
> -        ['mac'], bug=577144)
>  
>      # Mac Retina NVIDIA
>      self.Fail('conformance2/rendering/draw-buffers.html',
> +        ['mac', ('nvidia', 0xfe9)], bug=483282)
> +    self.Fail('conformance2/textures/misc/tex-input-validation.html',
>          ['mac', ('nvidia', 0xfe9)], bug=483282)
>  
>      # Linux only.

Closing this bug, as we always just update the test expectations when rolling
WebGL conformance and fails show up.