deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/failing_tests_android.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-conformance/extensions/oes-texture-float.html
-conformance/extensions/oes-vertex-array-object.html
-conformance/glsl/functions/glsl-function-abs.html
-conformance/glsl/functions/glsl-function-faceforward.html
-conformance/glsl/functions/glsl-function-sign.html
-conformance/glsl/functions/glsl-function-smoothstep-float.html
-conformance/glsl/functions/glsl-function-step-float.html
-conformance/glsl/functions/glsl-function-step-gentype.html
-conformance/limits/gl-max-texture-dimensions.html
-conformance/limits/gl-min-textures.html
-conformance/rendering/draw-elements-out-of-bounds.html
-conformance/state/gl-get-calls.html
-conformance/textures/tex-image-with-format-and-type.html
-conformance/textures/tex-sub-image-2d.html
-conformance/textures/texture-mips.html
-conformance/textures/texture-npot.html
-conformance/textures/texture-size-cube-maps.html

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/failing_tests_android_nvidia.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Failures for our Tegra 2 slaves.
-
-conformance/extensions/oes-standard-derivatives.html
-conformance/glsl/misc/shared.html
-conformance/misc/null-object-behaviour.html
-conformance/textures/texture-mips.html
-conformance/textures/texture-npot.html
-conformance/textures/texture-npot-video.html

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/failing_tests_android_x86.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# Failures for our android x86 and arm emulator test environments.
-
-conformance/extensions/oes-texture-float.html
-conformance/programs/get-active-test.html
-conformance/textures/texture-npot.html

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/failing_tests_linux.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-conformance/misc/uninitialized-test.html
-conformance/programs/gl-get-active-attribute.html
-conformance/textures/texture-mips.html
-conformance/uniforms/gl-uniform-bool.html
-conformance/renderbuffers/framebuffer-object-attachment.html

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/failing_tests_linux_mesa.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-conformance/textures/texture-size-cube-maps.html
-conformance/extensions/oes-texture-float.html
-conformance/glsl/functions/glsl-function-sin.html

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/failing_tests_linux_nvidia.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-conformance/misc/uninitialized-test.html
-conformance/programs/gl-get-active-attribute.html
-conformance/textures/texture-mips.html
-conformance/uniforms/gl-uniform-bool.html
-conformance/renderbuffers/framebuffer-object-attachment.html

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/failing_tests_mac.txt
+++ /dev/null
@@ -1,1 +0,0 @@
-conformance/glsl/misc/glsl-function-nodes.html

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/failing_tests_mac_mtnlion.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-conformance/glsl/functions/glsl-function-smoothstep-gentype.html
-conformance/glsl/variables/gl-pointcoord.html
-conformance/limits/gl-max-texture-dimensions.html
-conformance/textures/texture-size.html

deleted file mode 100644

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/failing_tests_windows_msbasicrender.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-conformance/renderbuffers/framebuffer-object-attachment.html
-conformance/state/gl-object-get-calls.html
-conformance/more/functions/isTests.html

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/mochitest-conformance-files.ini
+++ /dev/null
@@ -1,476 +0,0 @@
-[DEFAULT]
-support-files =
-  conformance/00_readme.txt
-  conformance/00_test_list.txt
-  conformance/LICENSE_CHROMIUM
-  conformance/attribs/00_test_list.txt
-  conformance/attribs/gl-enable-vertex-attrib.html
-  conformance/attribs/gl-vertex-attrib-zero-issues.html
-  conformance/attribs/gl-vertex-attrib.html
-  conformance/attribs/gl-vertexattribpointer-offsets.html
-  conformance/attribs/gl-vertexattribpointer.html
-  conformance/buffers/00_test_list.txt
-  conformance/buffers/buffer-bind-test.html
-  conformance/buffers/buffer-data-array-buffer.html
-  conformance/buffers/index-validation-copies-indices.html
-  conformance/buffers/index-validation-crash-with-buffer-sub-data.html
-  conformance/buffers/index-validation-verifies-too-many-indices.html
-  conformance/buffers/index-validation-with-resized-buffer.html
-  conformance/buffers/index-validation.html
-  conformance/canvas/00_test_list.txt
-  conformance/canvas/buffer-offscreen-test.html
-  conformance/canvas/buffer-preserve-test.html
-  conformance/canvas/canvas-test.html
-  conformance/canvas/canvas-zero-size.html
-  conformance/canvas/drawingbuffer-static-canvas-test.html
-  conformance/canvas/drawingbuffer-test.html
-  conformance/canvas/viewport-unchanged-upon-resize.html
-  conformance/context/00_test_list.txt
-  conformance/context/constants.html
-  conformance/context/context-attribute-preserve-drawing-buffer.html
-  conformance/context/context-attributes-alpha-depth-stencil-antialias.html
-  conformance/context/context-lost-restored.html
-  conformance/context/context-lost.html
-  conformance/context/context-type-test.html
-  conformance/context/incorrect-context-object-behaviour.html
-  conformance/context/methods.html
-  conformance/context/premultiplyalpha-test.html
-  conformance/context/resource-sharing-test.html
-  conformance/extensions/00_test_list.txt
-  conformance/extensions/ext-sRGB.html
-  conformance/extensions/ext-texture-filter-anisotropic.html
-  conformance/extensions/ext-shader-texture-lod.html
-  conformance/extensions/oes-standard-derivatives.html
-  conformance/extensions/oes-texture-float.html
-  conformance/extensions/oes-vertex-array-object.html
-  conformance/extensions/webgl-compressed-texture-etc1.html
-  conformance/extensions/webgl-compressed-texture-s3tc.html
-  conformance/extensions/webgl-debug-renderer-info.html
-  conformance/extensions/webgl-debug-shaders.html
-  conformance/extensions/webgl-depth-texture.html
-  conformance/glsl/00_test_list.txt
-  conformance/glsl/functions/00_test_list.txt
-  conformance/glsl/functions/glsl-function-abs.html
-  conformance/glsl/functions/glsl-function-acos.html
-  conformance/glsl/functions/glsl-function-asin.html
-  conformance/glsl/functions/glsl-function-atan-xy.html
-  conformance/glsl/functions/glsl-function-atan.html
-  conformance/glsl/functions/glsl-function-ceil.html
-  conformance/glsl/functions/glsl-function-clamp-float.html
-  conformance/glsl/functions/glsl-function-clamp-gentype.html
-  conformance/glsl/functions/glsl-function-cos.html
-  conformance/glsl/functions/glsl-function-cross.html
-  conformance/glsl/functions/glsl-function-distance.html
-  conformance/glsl/functions/glsl-function-dot.html
-  conformance/glsl/functions/glsl-function-faceforward.html
-  conformance/glsl/functions/glsl-function-floor.html
-  conformance/glsl/functions/glsl-function-fract.html
-  conformance/glsl/functions/glsl-function-length.html
-  conformance/glsl/functions/glsl-function-lessThan.html
-  conformance/glsl/functions/glsl-function-max-float.html
-  conformance/glsl/functions/glsl-function-max-gentype.html
-  conformance/glsl/functions/glsl-function-min-float.html
-  conformance/glsl/functions/glsl-function-min-gentype.html
-  conformance/glsl/functions/glsl-function-mix-float.html
-  conformance/glsl/functions/glsl-function-mix-gentype.html
-  conformance/glsl/functions/glsl-function-mod-float.html
-  conformance/glsl/functions/glsl-function-mod-gentype.html
-  conformance/glsl/functions/glsl-function-normalize.html
-  conformance/glsl/functions/glsl-function-reflect.html
-  conformance/glsl/functions/glsl-function-refract.html
-  conformance/glsl/functions/glsl-function-sign.html
-  conformance/glsl/functions/glsl-function-sin.html
-  conformance/glsl/functions/glsl-function-smoothstep-float.html
-  conformance/glsl/functions/glsl-function-smoothstep-gentype.html
-  conformance/glsl/functions/glsl-function-step-float.html
-  conformance/glsl/functions/glsl-function-step-gentype.html
-  conformance/glsl/functions/glsl-function.html
-  conformance/glsl/implicit/00_test_list.txt
-  conformance/glsl/implicit/add_int_float.vert.html
-  conformance/glsl/implicit/add_int_mat2.vert.html
-  conformance/glsl/implicit/add_int_mat3.vert.html
-  conformance/glsl/implicit/add_int_mat4.vert.html
-  conformance/glsl/implicit/add_int_vec2.vert.html
-  conformance/glsl/implicit/add_int_vec3.vert.html
-  conformance/glsl/implicit/add_int_vec4.vert.html
-  conformance/glsl/implicit/add_ivec2_vec2.vert.html
-  conformance/glsl/implicit/add_ivec3_vec3.vert.html
-  conformance/glsl/implicit/add_ivec4_vec4.vert.html
-  conformance/glsl/implicit/assign_int_to_float.vert.html
-  conformance/glsl/implicit/assign_ivec2_to_vec2.vert.html
-  conformance/glsl/implicit/assign_ivec3_to_vec3.vert.html
-  conformance/glsl/implicit/assign_ivec4_to_vec4.vert.html
-  conformance/glsl/implicit/construct_struct.vert.html
-  conformance/glsl/implicit/divide_int_float.vert.html
-  conformance/glsl/implicit/divide_int_mat2.vert.html
-  conformance/glsl/implicit/divide_int_mat3.vert.html
-  conformance/glsl/implicit/divide_int_mat4.vert.html
-  conformance/glsl/implicit/divide_int_vec2.vert.html
-  conformance/glsl/implicit/divide_int_vec3.vert.html
-  conformance/glsl/implicit/divide_int_vec4.vert.html
-  conformance/glsl/implicit/divide_ivec2_vec2.vert.html
-  conformance/glsl/implicit/divide_ivec3_vec3.vert.html
-  conformance/glsl/implicit/divide_ivec4_vec4.vert.html
-  conformance/glsl/implicit/equal_int_float.vert.html
-  conformance/glsl/implicit/equal_ivec2_vec2.vert.html
-  conformance/glsl/implicit/equal_ivec3_vec3.vert.html
-  conformance/glsl/implicit/equal_ivec4_vec4.vert.html
-  conformance/glsl/implicit/function_int_float.vert.html
-  conformance/glsl/implicit/function_ivec2_vec2.vert.html
-  conformance/glsl/implicit/function_ivec3_vec3.vert.html
-  conformance/glsl/implicit/function_ivec4_vec4.vert.html
-  conformance/glsl/implicit/greater_than.vert.html
-  conformance/glsl/implicit/greater_than_equal.vert.html
-  conformance/glsl/implicit/less_than.vert.html
-  conformance/glsl/implicit/less_than_equal.vert.html
-  conformance/glsl/implicit/multiply_int_float.vert.html
-  conformance/glsl/implicit/multiply_int_mat2.vert.html
-  conformance/glsl/implicit/multiply_int_mat3.vert.html
-  conformance/glsl/implicit/multiply_int_mat4.vert.html
-  conformance/glsl/implicit/multiply_int_vec2.vert.html
-  conformance/glsl/implicit/multiply_int_vec3.vert.html
-  conformance/glsl/implicit/multiply_int_vec4.vert.html
-  conformance/glsl/implicit/multiply_ivec2_vec2.vert.html
-  conformance/glsl/implicit/multiply_ivec3_vec3.vert.html
-  conformance/glsl/implicit/multiply_ivec4_vec4.vert.html
-  conformance/glsl/implicit/not_equal_int_float.vert.html
-  conformance/glsl/implicit/not_equal_ivec2_vec2.vert.html
-  conformance/glsl/implicit/not_equal_ivec3_vec3.vert.html
-  conformance/glsl/implicit/not_equal_ivec4_vec4.vert.html
-  conformance/glsl/implicit/subtract_int_float.vert.html
-  conformance/glsl/implicit/subtract_int_mat2.vert.html
-  conformance/glsl/implicit/subtract_int_mat3.vert.html
-  conformance/glsl/implicit/subtract_int_mat4.vert.html
-  conformance/glsl/implicit/subtract_int_vec2.vert.html
-  conformance/glsl/implicit/subtract_int_vec3.vert.html
-  conformance/glsl/implicit/subtract_int_vec4.vert.html
-  conformance/glsl/implicit/subtract_ivec2_vec2.vert.html
-  conformance/glsl/implicit/subtract_ivec3_vec3.vert.html
-  conformance/glsl/implicit/subtract_ivec4_vec4.vert.html
-  conformance/glsl/implicit/ternary_int_float.vert.html
-  conformance/glsl/implicit/ternary_ivec2_vec2.vert.html
-  conformance/glsl/implicit/ternary_ivec3_vec3.vert.html
-  conformance/glsl/implicit/ternary_ivec4_vec4.vert.html
-  conformance/glsl/matrices/00_test_list.txt
-  conformance/glsl/matrices/glsl-mat4-to-mat3.html
-  conformance/glsl/misc/00_test_list.txt
-  conformance/glsl/misc/attrib-location-length-limits.html
-  conformance/glsl/misc/embedded-struct-definitions-forbidden.html
-  conformance/glsl/misc/glsl-2types-of-textures-on-same-unit.html
-  conformance/glsl/misc/glsl-function-nodes.html
-  conformance/glsl/misc/glsl-long-variable-names.html
-  conformance/glsl/misc/glsl-vertex-branch.html
-  conformance/glsl/misc/include.vs
-  conformance/glsl/misc/non-ascii-comments.vert.html
-  conformance/glsl/misc/non-ascii.vert.html
-  conformance/glsl/misc/re-compile-re-link.html
-  conformance/glsl/misc/shader-with-256-character-identifier.frag.html
-  conformance/glsl/misc/shader-with-257-character-identifier.frag.html
-  conformance/glsl/misc/shader-with-_webgl-identifier.vert.html
-  conformance/glsl/misc/shader-with-arbitrary-indexing.frag.html
-  conformance/glsl/misc/shader-with-arbitrary-indexing.vert.html
-  conformance/glsl/misc/shader-with-attrib-array.vert.html
-  conformance/glsl/misc/shader-with-attrib-struct.vert.html
-  conformance/glsl/misc/shader-with-clipvertex.vert.html
-  conformance/glsl/misc/shader-with-comma-assignment.html
-  conformance/glsl/misc/shader-with-comma-conditional-assignment.html
-  conformance/glsl/misc/shader-with-conditional-scoping.html
-  conformance/glsl/misc/shader-with-default-precision.frag.html
-  conformance/glsl/misc/shader-with-default-precision.vert.html
-  conformance/glsl/misc/shader-with-define-line-continuation.frag.html
-  conformance/glsl/misc/shader-with-dfdx-no-ext.frag.html
-  conformance/glsl/misc/shader-with-dfdx.frag.html
-  conformance/glsl/misc/shader-with-do-scoping.html
-  conformance/glsl/misc/shader-with-error-directive.html
-  conformance/glsl/misc/shader-with-explicit-int-cast.vert.html
-  conformance/glsl/misc/shader-with-float-return-value.frag.html
-  conformance/glsl/misc/shader-with-for-loop.html
-  conformance/glsl/misc/shader-with-for-scoping.html
-  conformance/glsl/misc/shader-with-frag-depth.frag.html
-  conformance/glsl/misc/shader-with-function-recursion.frag.html
-  conformance/glsl/misc/shader-with-function-scoped-struct.html
-  conformance/glsl/misc/shader-with-functional-scoping.html
-  conformance/glsl/misc/shader-with-glcolor.vert.html
-  conformance/glsl/misc/shader-with-gles-1.frag.html
-  conformance/glsl/misc/shader-with-gles-symbol.frag.html
-  conformance/glsl/misc/shader-with-glprojectionmatrix.vert.html
-  conformance/glsl/misc/shader-with-hex-int-constant-macro.html
-  conformance/glsl/misc/shader-with-implicit-vec3-to-vec4-cast.vert.html
-  conformance/glsl/misc/shader-with-include.vert.html
-  conformance/glsl/misc/shader-with-int-return-value.frag.html
-  conformance/glsl/misc/shader-with-invalid-identifier.frag.html
-  conformance/glsl/misc/shader-with-ivec2-return-value.frag.html
-  conformance/glsl/misc/shader-with-ivec3-return-value.frag.html
-  conformance/glsl/misc/shader-with-ivec4-return-value.frag.html
-  conformance/glsl/misc/shader-with-limited-indexing.frag.html
-  conformance/glsl/misc/shader-with-line-directive.html
-  conformance/glsl/misc/shader-with-long-line.html
-  conformance/glsl/misc/shader-with-non-ascii-error.frag.html
-  conformance/glsl/misc/shader-with-precision.frag.html
-  conformance/glsl/misc/shader-with-quoted-error.frag.html
-  conformance/glsl/misc/shader-with-undefined-preprocessor-symbol.frag.html
-  conformance/glsl/misc/shader-with-uniform-in-loop-condition.vert.html
-  conformance/glsl/misc/shader-with-vec2-return-value.frag.html
-  conformance/glsl/misc/shader-with-vec3-return-value.frag.html
-  conformance/glsl/misc/shader-with-vec4-return-value.frag.html
-  conformance/glsl/misc/shader-with-vec4-vec3-vec4-conditional.html
-  conformance/glsl/misc/shader-with-version-100.frag.html
-  conformance/glsl/misc/shader-with-version-100.vert.html
-  conformance/glsl/misc/shader-with-version-120.vert.html
-  conformance/glsl/misc/shader-with-version-130.vert.html
-  conformance/glsl/misc/shader-with-webgl-identifier.vert.html
-  conformance/glsl/misc/shader-without-precision.frag.html
-  conformance/glsl/misc/shared.html
-  conformance/glsl/misc/struct-nesting-exceeds-maximum.html
-  conformance/glsl/misc/struct-nesting-under-maximum.html
-  conformance/glsl/misc/uniform-location-length-limits.html
-  conformance/glsl/reserved/00_test_list.txt
-  conformance/glsl/reserved/_webgl_field.vert.html
-  conformance/glsl/reserved/_webgl_function.vert.html
-  conformance/glsl/reserved/_webgl_struct.vert.html
-  conformance/glsl/reserved/_webgl_variable.vert.html
-  conformance/glsl/reserved/webgl_field.vert.html
-  conformance/glsl/reserved/webgl_function.vert.html
-  conformance/glsl/reserved/webgl_struct.vert.html
-  conformance/glsl/reserved/webgl_variable.vert.html
-  conformance/glsl/samplers/00_test_list.txt
-  conformance/glsl/samplers/glsl-function-texture2d-bias.html
-  conformance/glsl/samplers/glsl-function-texture2dlod.html
-  conformance/glsl/samplers/glsl-function-texture2dproj.html
-  conformance/glsl/variables/00_test_list.txt
-  conformance/glsl/variables/gl-fragcoord.html
-  conformance/glsl/variables/gl-frontfacing.html
-  conformance/glsl/variables/gl-pointcoord.html
-  conformance/limits/00_test_list.txt
-  conformance/limits/gl-max-texture-dimensions.html
-  conformance/limits/gl-min-attribs.html
-  conformance/limits/gl-min-textures.html
-  conformance/limits/gl-min-uniforms.html
-  conformance/misc/00_test_list.txt
-  conformance/misc/bad-arguments-test.html
-  conformance/misc/delayed-drawing.html
-  conformance/misc/error-reporting.html
-  conformance/misc/functions-returning-strings.html
-  conformance/misc/instanceof-test.html
-  conformance/misc/invalid-passed-params.html
-  conformance/misc/is-object.html
-  conformance/misc/null-object-behaviour.html
-  conformance/misc/object-deletion-behaviour.html
-  conformance/misc/shader-precision-format.html
-  conformance/misc/type-conversion-test.html
-  conformance/misc/uninitialized-test.html
-  conformance/misc/webgl-specific.html
-  conformance/more/00_test_list.txt
-  conformance/more/README.md
-  conformance/more/all_tests.html
-  conformance/more/all_tests_linkonly.html
-  conformance/more/all_tests_sequential.html
-  conformance/more/conformance/argGenerators-A.js
-  conformance/more/conformance/argGenerators-B1.js
-  conformance/more/conformance/argGenerators-B2.js
-  conformance/more/conformance/argGenerators-B3.js
-  conformance/more/conformance/argGenerators-B4.js
-  conformance/more/conformance/argGenerators-C.js
-  conformance/more/conformance/argGenerators-D_G.js
-  conformance/more/conformance/argGenerators-G_I.js
-  conformance/more/conformance/argGenerators-L_S.js
-  conformance/more/conformance/argGenerators-S_V.js
-  conformance/more/conformance/badArgsArityLessThanArgc.html
-  conformance/more/conformance/constants.html
-  conformance/more/conformance/fuzzTheAPI.html
-  conformance/more/conformance/getContext.html
-  conformance/more/conformance/methods.html
-  conformance/more/conformance/quickCheckAPI-A.html
-  conformance/more/conformance/quickCheckAPI-B1.html
-  conformance/more/conformance/quickCheckAPI-B2.html
-  conformance/more/conformance/quickCheckAPI-B3.html
-  conformance/more/conformance/quickCheckAPI-B4.html
-  conformance/more/conformance/quickCheckAPI-C.html
-  conformance/more/conformance/quickCheckAPI-D_G.html
-  conformance/more/conformance/quickCheckAPI-G_I.html
-  conformance/more/conformance/quickCheckAPI-L_S.html
-  conformance/more/conformance/quickCheckAPI-S_V.html
-  conformance/more/conformance/quickCheckAPI.js
-  conformance/more/conformance/quickCheckAPIBadArgs.html
-  conformance/more/conformance/webGLArrays.html
-  conformance/more/demos/opengl_web.html
-  conformance/more/demos/video.html
-  conformance/more/functions/bindBuffer.html
-  conformance/more/functions/bindBufferBadArgs.html
-  conformance/more/functions/bindFramebufferLeaveNonZero.html
-  conformance/more/functions/bufferData.html
-  conformance/more/functions/bufferDataBadArgs.html
-  conformance/more/functions/bufferSubData.html
-  conformance/more/functions/bufferSubDataBadArgs.html
-  conformance/more/functions/copyTexImage2D.html
-  conformance/more/functions/copyTexImage2DBadArgs.html
-  conformance/more/functions/copyTexSubImage2D.html
-  conformance/more/functions/copyTexSubImage2DBadArgs.html
-  conformance/more/functions/deleteBufferBadArgs.html
-  conformance/more/functions/drawArrays.html
-  conformance/more/functions/drawArraysOutOfBounds.html
-  conformance/more/functions/drawElements.html
-  conformance/more/functions/drawElementsBadArgs.html
-  conformance/more/functions/isTests.html
-  conformance/more/functions/readPixels.html
-  conformance/more/functions/readPixelsBadArgs.html
-  conformance/more/functions/texImage2D.html
-  conformance/more/functions/texImage2DBadArgs.html
-  conformance/more/functions/texImage2DHTML.html
-  conformance/more/functions/texImage2DHTMLBadArgs.html
-  conformance/more/functions/texSubImage2D.html
-  conformance/more/functions/texSubImage2DBadArgs.html
-  conformance/more/functions/texSubImage2DHTML.html
-  conformance/more/functions/texSubImage2DHTMLBadArgs.html
-  conformance/more/functions/uniformMatrix.html
-  conformance/more/functions/uniformMatrixBadArgs.html
-  conformance/more/functions/uniformf.html
-  conformance/more/functions/uniformfArrayLen1.html
-  conformance/more/functions/uniformfBadArgs.html
-  conformance/more/functions/uniformi.html
-  conformance/more/functions/uniformiBadArgs.html
-  conformance/more/functions/vertexAttrib.html
-  conformance/more/functions/vertexAttribBadArgs.html
-  conformance/more/functions/vertexAttribPointer.html
-  conformance/more/functions/vertexAttribPointerBadArgs.html
-  conformance/more/glsl/arrayOutOfBounds.html
-  conformance/more/glsl/longLoops.html
-  conformance/more/glsl/uniformOutOfBounds.html
-  conformance/more/glsl/unusedAttribsUniforms.html
-  conformance/more/index.html
-  conformance/more/performance/CPUvsGPU.html
-  conformance/more/performance/bandwidth.html
-  conformance/more/performance/jsGCPause.html
-  conformance/more/performance/jsMatrixMult.html
-  conformance/more/performance/jsToGLOverhead.html
-  conformance/more/unit.css
-  conformance/more/unit.js
-  conformance/more/util.js
-  conformance/programs/00_test_list.txt
-  conformance/programs/get-active-test.html
-  conformance/programs/gl-bind-attrib-location-test.html
-  conformance/programs/gl-get-active-attribute.html
-  conformance/programs/gl-get-active-uniform.html
-  conformance/programs/gl-getshadersource.html
-  conformance/programs/gl-shader-test.html
-  conformance/programs/invalid-UTF-16.html
-  conformance/programs/program-test.html
-  conformance/reading/00_test_list.txt
-  conformance/reading/read-pixels-pack-alignment.html
-  conformance/reading/read-pixels-test.html
-  conformance/renderbuffers/00_test_list.txt
-  conformance/renderbuffers/framebuffer-object-attachment.html
-  conformance/renderbuffers/framebuffer-test.html
-  conformance/renderbuffers/renderbuffer-initialization.html
-  conformance/rendering/00_test_list.txt
-  conformance/rendering/draw-arrays-out-of-bounds.html
-  conformance/rendering/draw-elements-out-of-bounds.html
-  conformance/rendering/gl-clear.html
-  conformance/rendering/gl-drawelements.html
-  conformance/rendering/gl-scissor-test.html
-  conformance/rendering/line-loop-tri-fan.html
-  conformance/rendering/more-than-65536-indices.html
-  conformance/rendering/point-size.html
-  conformance/rendering/triangle.html
-  conformance/resources/3x3.png
-  conformance/resources/blue-1x1.jpg
-  conformance/resources/boolUniformShader.vert
-  conformance/resources/bug-32888-texture.png
-  conformance/resources/floatUniformShader.vert
-  conformance/resources/fragmentShader.frag
-  conformance/resources/glsl-conformance-test.js
-  conformance/resources/glsl-feature-tests.css
-  conformance/resources/glsl-generator.js
-  conformance/resources/gray-ramp-256-with-128-alpha.png
-  conformance/resources/gray-ramp-256.png
-  conformance/resources/gray-ramp-default-gamma.png
-  conformance/resources/gray-ramp-gamma0.1.png
-  conformance/resources/gray-ramp-gamma1.0.png
-  conformance/resources/gray-ramp-gamma2.0.png
-  conformance/resources/gray-ramp-gamma4.0.png
-  conformance/resources/gray-ramp-gamma9.0.png
-  conformance/resources/gray-ramp.png
-  conformance/resources/green-2x2-16bit.png
-  conformance/resources/intArrayUniformShader.vert
-  conformance/resources/intUniformShader.vert
-  conformance/resources/matUniformShader.vert
-  conformance/resources/noopUniformShader.frag
-  conformance/resources/noopUniformShader.vert
-  conformance/resources/npot-video.mp4
-  conformance/resources/npot-video.theora.ogv
-  conformance/resources/npot-video.webmvp8.webm
-  conformance/resources/pnglib.js
-  conformance/resources/red-green.mp4
-  conformance/resources/red-green.png
-  conformance/resources/red-green.theora.ogv
-  conformance/resources/red-green.webmvp8.webm
-  conformance/resources/red-indexed.png
-  conformance/resources/samplerUniformShader.frag
-  conformance/resources/small-square-with-cie-rgb-profile.png
-  conformance/resources/small-square-with-colormatch-profile.png
-  conformance/resources/small-square-with-colorspin-profile.jpg
-  conformance/resources/small-square-with-colorspin-profile.png
-  conformance/resources/small-square-with-e-srgb-profile.png
-  conformance/resources/small-square-with-smpte-c-profile.png
-  conformance/resources/small-square-with-srgb-iec61966-2.1-profile.png
-  conformance/resources/structUniformShader.vert
-  conformance/resources/vertexShader.vert
-  conformance/resources/webgl-test-utils.js
-  conformance/resources/webgl-test.js
-  conformance/resources/zero-alpha.png
-  conformance/state/00_test_list.txt
-  conformance/state/gl-enable-enum-test.html
-  conformance/state/gl-enum-tests.html
-  conformance/state/gl-get-calls.html
-  conformance/state/gl-geterror.html
-  conformance/state/gl-getstring.html
-  conformance/state/gl-object-get-calls.html
-  conformance/textures/00_test_list.txt
-  conformance/textures/compressed-tex-image.html
-  conformance/textures/copy-tex-image-and-sub-image-2d.html
-  conformance/textures/gl-pixelstorei.html
-  conformance/textures/gl-teximage.html
-  conformance/textures/origin-clean-conformance.html
-  conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html
-  conformance/textures/tex-image-and-sub-image-2d-with-canvas.html
-  conformance/textures/tex-image-and-sub-image-2d-with-image-data.html
-  conformance/textures/tex-image-and-sub-image-2d-with-image.html
-  conformance/textures/tex-image-and-sub-image-2d-with-video.html
-  conformance/textures/tex-image-and-uniform-binding-bugs.html
-  conformance/textures/tex-image-with-format-and-type.html
-  conformance/textures/tex-image-with-invalid-data.html
-  conformance/textures/tex-input-validation.html
-  conformance/textures/tex-sub-image-2d-bad-args.html
-  conformance/textures/tex-sub-image-2d.html
-  conformance/textures/texparameter-test.html
-  conformance/textures/texture-active-bind-2.html
-  conformance/textures/texture-active-bind.html
-  conformance/textures/texture-clear.html
-  conformance/textures/texture-complete.html
-  conformance/textures/texture-formats-test.html
-  conformance/textures/texture-mips.html
-  conformance/textures/texture-npot-video.html
-  conformance/textures/texture-npot.html
-  conformance/textures/texture-size-cube-maps.html
-  conformance/textures/texture-size.html
-  conformance/textures/texture-transparent-pixels-initialized.html
-  conformance/typedarrays/00_test_list.txt
-  conformance/typedarrays/array-buffer-crash.html
-  conformance/typedarrays/array-buffer-view-crash.html
-  conformance/typedarrays/array-unit-tests.html
-  conformance/uniforms/00_test_list.txt
-  conformance/uniforms/gl-uniform-arrays.html
-  conformance/uniforms/gl-uniform-bool.html
-  conformance/uniforms/gl-uniformmatrix4fv.html
-  conformance/uniforms/gl-unknown-uniform.html
-  conformance/uniforms/null-uniform-location.html
-  conformance/uniforms/uniform-location.html
-  conformance/uniforms/uniform-samplers-test.html
-  resources/cors-util.js
-  resources/desktop-gl-constants.js
-  resources/js-test-pre.js
-  resources/js-test-style.css
-  resources/opengl_logo.jpg
-  resources/thunderbird-logo-64x64.png
-  resources/webgl-logo.png
-  resources/webgl-test-harness.js

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/mochitest.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[DEFAULT]
-skip-if = e10s
-support-files =
-  00_test_list.txt
-  failing_tests_android.txt
-  failing_tests_android_nvidia.txt
-  failing_tests_android_x86.txt
-  failing_tests_linux.txt
-  failing_tests_linux_mesa.txt
-  failing_tests_linux_nvidia.txt
-  failing_tests_mac.txt
-  failing_tests_mac_mtnlion.txt
-  failing_tests_windows.txt
-  failing_tests_windows_msbasicrender.txt
-  skipped_tests_android.txt
-  skipped_tests_android_x86.txt
-  skipped_tests_linux_mesa.txt
-  skipped_tests_win_vista.txt
-  skipped_tests_winxp.txt
-
-[test_webgl_conformance_test_suite.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' # bug 865443- separate suite - the non_conf* tests pass except for one on armv6 tests

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/skipped_tests_android.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-conformance/misc/uninitialized-test.html
-conformance/renderbuffers/framebuffer-object-attachment.html
-conformance/textures/texture-size.html
-conformance/more/conformance/quickCheckAPI-A.html
-conformance/more/conformance/quickCheckAPI-B1.html
-conformance/more/conformance/quickCheckAPI-B2.html
-conformance/more/conformance/quickCheckAPI-B3.html
-conformance/more/conformance/quickCheckAPI-B4.html
-conformance/more/conformance/quickCheckAPIBadArgs.html
-conformance/more/conformance/quickCheckAPI-C.html
-conformance/more/conformance/quickCheckAPI-D_G.html
-conformance/more/conformance/quickCheckAPI-G_I.html
-conformance/more/conformance/quickCheckAPI-L_S.html
-conformance/more/conformance/quickCheckAPI-S_V.html

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/skipped_tests_android_x86.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-conformance/extensions/oes-vertex-array-object.html
-conformance/glsl/functions/glsl-function-abs.html
-conformance/glsl/functions/glsl-function-faceforward.html
-conformance/glsl/functions/glsl-function-sign.html
-conformance/glsl/functions/glsl-function-sin.html
-conformance/glsl/functions/glsl-function-step-float.html
-conformance/glsl/functions/glsl-function-step-gentype.html
-conformance/glsl/functions/glsl-function-smoothstep-float.html
-conformance/limits/gl-max-texture-dimensions.html
-conformance/limits/gl-min-textures.html
-conformance/misc/error-reporting.html
-conformance/misc/object-deletion-behaviour.html
-conformance/misc/type-conversion-test.html
-conformance/reading/read-pixels-test.html
-conformance/renderbuffers/framebuffer-object-attachment.html
-conformance/textures/gl-teximage.html
-conformance/textures/origin-clean-conformance.html
-conformance/textures/tex-image-and-sub-image-2d-with-image.html
-conformance/textures/tex-image-and-sub-image-2d-with-video.html
-conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html
-conformance/textures/texture-mips.html
-conformance/textures/texture-npot-video.html
-conformance/textures/texture-size.html
-conformance/textures/texture-size-cube-maps.html
-conformance/more/conformance/quickCheckAPI-A.html
-conformance/more/conformance/quickCheckAPI-B1.html
-conformance/more/conformance/quickCheckAPI-B2.html
-conformance/more/conformance/quickCheckAPI-B3.html
-conformance/more/conformance/quickCheckAPI-B4.html
-conformance/more/conformance/quickCheckAPIBadArgs.html
-conformance/more/conformance/quickCheckAPI-C.html
-conformance/more/conformance/quickCheckAPI-D_G.html
-conformance/more/conformance/quickCheckAPI-G_I.html
-conformance/more/conformance/quickCheckAPI-L_S.html
-conformance/more/conformance/quickCheckAPI-S_V.html

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/skipped_tests_linux.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-conformance/more/conformance/quickCheckAPI-A.html
-conformance/more/conformance/quickCheckAPI-B1.html
-conformance/more/conformance/quickCheckAPI-B2.html
-conformance/more/conformance/quickCheckAPI-B3.html
-conformance/more/conformance/quickCheckAPI-B4.html
-conformance/more/conformance/quickCheckAPIBadArgs.html
-conformance/more/conformance/quickCheckAPI-C.html
-conformance/more/conformance/quickCheckAPI-D_G.html
-conformance/more/conformance/quickCheckAPI-G_I.html
-conformance/more/conformance/quickCheckAPI-L_S.html
-conformance/more/conformance/quickCheckAPI-S_V.html

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/skipped_tests_linux_mesa.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-conformance/limits/gl-max-texture-dimensions.html
-conformance/misc/type-conversion-test.html
-conformance/reading/read-pixels-test.html
-conformance/textures/texture-mips.html
-conformance/more/conformance/quickCheckAPI-A.html
-conformance/more/conformance/quickCheckAPI-B1.html
-conformance/more/conformance/quickCheckAPI-B2.html
-conformance/more/conformance/quickCheckAPI-B3.html
-conformance/more/conformance/quickCheckAPI-B4.html
-conformance/more/conformance/quickCheckAPIBadArgs.html
-conformance/more/conformance/quickCheckAPI-C.html
-conformance/more/conformance/quickCheckAPI-D_G.html
-conformance/more/conformance/quickCheckAPI-G_I.html
-conformance/more/conformance/quickCheckAPI-L_S.html
-conformance/more/conformance/quickCheckAPI-S_V.html

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/skipped_tests_win_vista.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-conformance/textures/tex-image-and-sub-image-2d-with-video.html
-conformance/textures/texture-npot-video.html

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/skipped_tests_winxp.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-conformance/more/conformance/quickCheckAPI-B2.html
-conformance/more/conformance/quickCheckAPI-B3.html
-conformance/more/functions/bufferSubDataBadArgs.html

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/test_webgl_conformance_test_suite.html
+++ /dev/null
@@ -1,653 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-  "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>
-Mochitest version of the WebGL Conformance Test Suite
-</title>
-<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-<script type="text/javascript" src="resources/webgl-test-harness.js"></script>
-<script>
-
-var CONFORMANCE_TEST_VERSION = "1.0.1 (beta)";
-
-var OPTIONS = {
-  version: CONFORMANCE_TEST_VERSION
-};
-
-/**
- * This is copied from webgl-test-harness.js where it is defined as a private function, not accessible to us (argh!)
- *
- * Loads text from an external file. This function is synchronous.
- * @param {string} url The url of the external file.
- * @return {string} the loaded text if the request is synchronous.
- */
-  var loadTextFileSynchronous = function (url) {
-    var error = 'loadTextFileSynchronous failed to load url "' + url + '"';
-    var request;
-    if (window.XMLHttpRequest) {
-      request = new XMLHttpRequest();
-      if (request.overrideMimeType) {
-        request.overrideMimeType('text/plain');
-      }
-    } else {
-      throw 'XMLHttpRequest is disabled';
-    }
-    request.open('GET', url, false);
-    request.send(null);
-    if (request.readyState != 4) {
-      throw error;
-    }
-    if (request.status >= 400) {
-      // Error response, probably a 404.
-      throw 'Error: request.status: ' + request.status;
-    }
-    return request.responseText;
-  };
-
-SimpleTest.waitForExplicitFinish();
-
-function detectDriverInfo() {
-  const Cc = SpecialPowers.Cc;
-  const Ci = SpecialPowers.Ci;
-  var doc = Cc["@mozilla.org/xmlextras/domparser;1"].createInstance(Ci.nsIDOMParser).parseFromString("<html/>", "text/html");
-
-  var canvas = doc.createElement("canvas");
-  canvas.width = 1;
-  canvas.height = 1;
-
-  var type = "";
-  var gl;
-  try {
-    gl = canvas.getContext("experimental-webgl");
-  } catch(e) {
-    ok(false, "Failed to create a WebGL context for getting driver info.");
-    return ["", ""]
-  }
-  var ext = gl.getExtension("WEBGL_debug_renderer_info");
-  // this extension is unconditionally available to chrome. No need to check.
-  
-  var webglRenderer = gl.getParameter(ext.UNMASKED_RENDERER_WEBGL);
-  var webglVendor = gl.getParameter(ext.UNMASKED_VENDOR_WEBGL);
-  return [webglVendor, webglRenderer];
-}
-
-function start() {
-  var OS_WINDOWS = 'windows';
-  var OS_MAC     = 'mac';
-  var OS_LINUX   = 'linux';
-  var OS_ANDROID = 'android';
-  
-  var GLDRIVER_MESA   = 'mesa';
-  var GLDRIVER_NVIDIA = 'nvidia';
-  var GLDRIVER_X86EMULATOR = 'android x86 emulator';
-  var GLDRIVER_MSBASICRENDER = 'Microsoft Basic Render Driver';
-
-  var kOS = null;
-  var kOSVersion = null;
-  var kGLDriver = null;
-
-  if (navigator.platform.indexOf('Win') == 0) {
-    kOS = OS_WINDOWS;
-    
-    // code borrowed from browser/modules/test/browser_taskbar_preview.js
-    var version = SpecialPowers.Services.sysinfo.getProperty('version');
-    kOSVersion = parseFloat(version);
-    // Version 6.0 is Vista, 6.1 is 7.
-  } else if (navigator.platform.indexOf('Mac') == 0) {
-    kOS = OS_MAC;
-    
-    var versionMatch = /Mac OS X (\d+.\d+)/.exec(navigator.userAgent);
-    kOSVersion = versionMatch ? parseFloat(versionMatch[1]) : null;
-  } else if (navigator.appVersion.indexOf('Android') != -1) {
-    kOS = OS_ANDROID;
-  } else if (navigator.platform.indexOf('Linux') == 0) {
-    // Must be checked after android, as android also has a 'Linux' platform string.
-    kOS = OS_LINUX;
-  }
-  
-  var glVendor, glRenderer;
-  [glVendor, glRenderer] = detectDriverInfo();
-  info('GL vendor: ' + glVendor);
-  info('GL renderer: ' + glRenderer);
-  
-  if (glRenderer.contains('Android Emulator')) {
-    kGLDriver = GLDRIVER_X86EMULATOR;
-  } else if (glRenderer.contains('llvmpipe')) {
-    kGLDriver = GLDRIVER_MESA;
-  } else if (glVendor.contains('NVIDIA')) {
-    kGLDriver = GLDRIVER_NVIDIA;
-  } else if (glRenderer.contains(GLDRIVER_MSBASICRENDER)) {
-    kGLDriver = GLDRIVER_MSBASICRENDER;
-  }
-
-  if (kOS) {
-    info('OS detected as: ' + kOS);
-    info('  Version: ' + kOSVersion);
-  } else {
-    info('OS not detected.');
-    info('  `platform`:   ' + navigator.platform);
-    info('  `appVersion`: ' + navigator.appVersion);
-    info('  `userAgent`:  ' + navigator.userAgent);
-  }
-  if (kGLDriver) {
-    info('GL driver detected as: ' + kGLDriver);
-  } else {
-    info('GL driver not detected.');
-  }
-  
-  var requestLongerTimeoutLen = 3;
-  if (kOS == OS_ANDROID)
-    requestLongerTimeoutLen = 6;
-
-  function getEnv(env) {
-    var envsvc = SpecialPowers.Cc["@mozilla.org/process/environment;1"].getService(SpecialPowers.Ci.nsIEnvironment);
-    var val = envsvc.get(env);
-    if (val == "")
-      return null;
-    return val;
-  }
-
-  var reportType = WebGLTestHarnessModule.TestHarness.reportType;
-
-  var Page = function(reporter, url) {
-    this.reporter = reporter;
-    this.url = url;
-    this.totalTests = 0;
-    this.totalSuccessful = 0;
-    this.totalTimeouts = 0;
-
-    var li = reporter.localDoc.createElement('li');
-    var div = reporter.localDoc.createElement('div');
-    var a = reporter.localDoc.createElement('a');
-    a.href = url;
-    var node = reporter.localDoc.createTextNode(url);
-    a.appendChild(node);
-    div.appendChild(a);
-    li.setAttribute('class', 'testpage');
-    li.appendChild(div);
-    var ul = reporter.localDoc.createElement('ul');
-    var node = reporter.localDoc.createTextNode('');
-    li.appendChild(ul);
-    div.appendChild(node);
-    this.totalsElem = node;
-    this.resultElem = ul;
-    this.elem = li;
-  };
-
-  /**
-   * Indicates whether this test page results are not to be ignored.
-   */
-  Page.prototype.shouldBeAccountedFor = function() {
-    return testsToIgnore.indexOf(this.url) == -1;
-  }
-
-  /**
-   * Indicates whether all this test page results are expected not to fail,
-   * if not ignored.
-   */
-  Page.prototype.isExpectedToFullyPass = function() {
-    return this.shouldBeAccountedFor() &&
-           testsExpectedToFail.indexOf(this.url) == -1;
-  }
-
-  /**
-   * Returns log message with added test page url.
-   */
-  Page.prototype.logMsg = function(msg) {
-    return '[' + this.url + '] ' + msg;
-  }
-
-  /**
-   * Reports an individual test result of test page.
-   */
-  Page.prototype.addResult = function(msg, success) {
-    ++this.totalTests;
-    if (success === undefined) {
-      ++this.totalTimeouts;
-      var result = "timeout";
-      var css = "timeout";
-      // only few timeouts are actually caught here --- most are caught in finishPage().
-      if (this.isExpectedToFullyPass()) {
-        ok(false, this.logMsg('Test timed out'), msg);
-      } else {
-        todo(false, this.logMsg('Test timed out'), msg);
-      }
-    } else if (success) {
-      ++this.totalSuccessful;
-      var result = "success";
-      var css = "success";
-      if (this.shouldBeAccountedFor()) {
-        ok(true, this.logMsg('Test passed'), msg);
-      } else {
-        todo(false, this.logMsg('Test passed, but is ignored'), msg);
-      }
-      // Don't report individual success to UI, to keep it light.
-      return;
-    } else {
-      var result = "failed";
-      var css = "fail";
-      if (this.isExpectedToFullyPass()) {
-        ok(false, this.logMsg('Test failed'), msg);
-      } else {
-        todo(false, this.logMsg('Test failed'), msg);
-      }
-    }
-
-    var node = this.reporter.localDoc.createTextNode(result + ': ' + msg);
-    var li = this.reporter.localDoc.createElement('li');
-    li.appendChild(node);
-    li.setAttribute('class', css);
-    this.resultElem.appendChild(li);
-  };
-
-  Page.prototype.startPage = function() {
-    this.totalTests = 0;
-    this.totalSuccessful = 0;
-    this.totalTimeouts = 0;
-    // remove previous results.
-    while (this.resultElem.hasChildNodes()) {
-      this.resultElem.removeChild(this.resultElem.childNodes[0]);
-    }
-    this.totalsElem.textContent = '';
-    return true;
-  };
-
-  /**
-   * Reports test page result summary.
-   */
-  Page.prototype.finishPage = function(success) {
-    var msg = ' (' + this.totalSuccessful + ' of ' +
-              this.totalTests + ' passed)';
-    if (success === undefined) {
-      var css = 'testpagetimeout';
-      msg = '(*timeout*)';
-      ++this.totalTests;
-      ++this.totalTimeouts;
-      // Most timeouts are only caught here --- though a few are (already) caught in addResult().
-      if (this.isExpectedToFullyPass()) {
-        ok(false, this.logMsg('Timeout in this test page'));
-      } else {
-        todo(false, this.logMsg('Timeout in this test page'));
-      }
-    } else if (this.totalSuccessful != this.totalTests) {
-      var css = 'testpagefail';
-      var totalFailed = this.totalTests - this.totalTimeouts - this.totalSuccessful;
-      if (this.isExpectedToFullyPass()) {
-        ok(false, this.logMsg("(WebGL test error) " + totalFailed + ' failure(s) and ' + this.totalTimeouts + ' timeout(s)'));
-      } else {
-        todo(false, this.logMsg("(WebGL test error) " + totalFailed + ' failure(s) and ' + this.totalTimeouts + ' timeout(s)'));
-      }
-    } else {
-      var css = 'testpagesuccess';
-      if (this.isExpectedToFullyPass()) {
-        ok(true, this.logMsg('All ' + this.totalSuccessful + ' test(s) passed'));
-      } else {
-        if (this.shouldBeAccountedFor()) {
-          todo(true, this.logMsg('Test page expected to fail, but all ' + this.totalSuccessful + ' tests passed'));
-        } else {
-          todo(false, this.logMsg('All ' + this.totalSuccessful + ' test(s) passed, but test page is ignored'));
-        }
-      }
-    }
-    this.elem.setAttribute('class', css);
-    this.totalsElem.textContent = msg;
-  };
-
-  var Reporter = function() {
-    this.localDoc = document;
-
-    this.fullResultsElem = document.getElementById("results-default");
-
-    this.resultElem = document.getElementById("results");
-    var node = this.localDoc.createTextNode('');
-    this.fullResultsElem.appendChild(node);
-    this.fullResultsNode = node;
-    this.iframe = document.getElementById("testframe");
-    this.currentPageElem = null;
-    this.totalPages = 0;
-    this.pagesByURL = {};
-    this.currentPage = null;
-    this.totalTests = 0;
-    this.totalSuccessful = 0;
-    this.totalTimeouts = 0;
-  };
-
-  Reporter.prototype.runTest = function(url) {
-    var page = this.pagesByURL[url];
-    page.startPage();
-    this.currentPage = page;
-    this.iframe.src = url;
-    return result;
-  };
-
-  Reporter.prototype.addPage = function(url) {
-    this.currentPage = new Page(this, url, this.resultElem);
-    this.resultElem.appendChild(this.currentPage.elem);
-    ++this.totalPages;
-    this.pagesByURL[url] = this.currentPage;
-  };
-
-  Reporter.prototype.startPage = function(url) {
-    if (testsToSkip.indexOf(url) != -1) {
-      info("[" + url + "] (WebGL mochitest) Skipping test page");
-      return false;
-    }
-    info("[" + url + "] (WebGL mochitest) Starting test page");
-
-    // Calling garbageCollect before each test page fixes intermittent failures with
-    // out-of-memory errors, often failing to create a WebGL context.
-    // The explanation is that the JS engine keeps unreferenced WebGL contexts around
-    // for too long before GCing (bug 617453), so that during this mochitest dozens of unreferenced
-    // WebGL contexts can accumulate at a given time.
-    SpecialPowers.DOMWindowUtils.cycleCollect();
-    SpecialPowers.DOMWindowUtils.garbageCollect();
-    SpecialPowers.DOMWindowUtils.garbageCollect();
-
-    var page = this.pagesByURL[url];
-    this.currentPage = page;
-    statusTextNode.textContent = 'Running URL: ' + url;
-    expectedtofailTextNode.textContent = testsExpectedToFail.length +
-                                         ' test pages are expected to fail out of ' +
-                                         this.totalPages;
-    ignoredtestsTextNode.textContent = testsToIgnore.length +
-                                         ' test pages have their results ignored';
-    return page.startPage();
-  };
-
-  Reporter.prototype.displayStats = function() {
-    var totalFailed = this.totalTests - this.totalTimeouts - this.totalSuccessful;
-    this.fullResultsNode.textContent =
-      this.totalSuccessful + ' passed, ' +
-      totalFailed + ' failed, ' +
-      this.totalTimeouts + ' timed out';
-  };
-
-  Reporter.prototype.addResult = function(msg, success) {
-    if (this.currentPage != null) {
-      this.currentPage.addResult(msg, success);
-    }
-  };
-
-  Reporter.prototype.finishPage = function(success) {
-    if (this.currentPage != null) {
-      this.currentPage.finishPage(success); // must call that first, since this is where totalTimeouts is computed
-      this.totalTests += this.currentPage.totalTests;
-      this.totalSuccessful += this.currentPage.totalSuccessful;
-      this.totalTimeouts += this.currentPage.totalTimeouts;
-      this.currentPage = null;
-      this.displayStats();
-    }
-  };
-
-  Reporter.prototype.finishedTestSuite = function() {
-      statusTextNode.textContent = 'Finished';
-      SimpleTest.finish();
-  }
-
-  Reporter.prototype.ready = function() {
-    statusTextNode.textContent = 'Loaded test lists. Starting tests...';
-    window.webglTestHarness.runTests();
-  }
-
-  Reporter.prototype.reportFunc = function(type, msg, success) {
-    switch (type) {
-      case reportType.ADD_PAGE:
-        return this.addPage(msg);
-      case reportType.READY:
-        return this.ready();
-      case reportType.START_PAGE:
-        return this.startPage(msg);
-      case reportType.TEST_RESULT:
-        return this.addResult(msg, success);
-      case reportType.FINISH_PAGE:
-        return this.finishPage(success);
-      case reportType.FINISHED_ALL_TESTS:
-        this.finishedTestSuite();
-        return true;
-      default:
-        throw 'unhandled';
-        break;
-    }
-  };
-
-  var getURLOptions = function(obj) {
-    var s = window.location.href;
-    var q = s.indexOf("?");
-    var e = s.indexOf("#");
-    if (e < 0) {
-      e = s.length;
-    }
-    var query = s.substring(q + 1, e);
-    var pairs = query.split("&");
-    for (var ii = 0; ii < pairs.length; ++ii) {
-      var keyValue = pairs[ii].split("=");
-      var key = keyValue[0];
-      var value = decodeURIComponent(keyValue[1]);
-          obj[key] = value;
-    }
-  };
-
-  getURLOptions(OPTIONS);
-
-  function runTestSuite() {
-    var reporter = new Reporter();
-
-    // try to create a dummy WebGL context, just to catch context creation failures once here,
-    // rather than having them result in 100's of failures (one in each test page)
-    var ctx;
-    try {
-      ctx = document.getElementById("webglcheck-default")
-                    .getContext("experimental-webgl");
-    } catch(e) {}
-    if (!ctx) {
-        var errmsg = "Can't create a WebGL context";
-        reporter.fullResultsNode.textContent = errmsg;
-        // Workaround for SeaMonkey tinderboxes which don't support WebGL.
-        if (navigator.userAgent.match(/ SeaMonkey\//))
-          todo(false, errmsg + " (This is expected on SeaMonkey (tinderboxes).)");
-        else if (SpecialPowers.getBoolPref("webgl.disabled"))
-          todo(false, errmsg + " (This is expected on when WebGL is disabled)");
-        else
-          ok(false, errmsg);
-        reporter.finishedTestSuite();
-        return;
-    }
-
-    statusTextNode.textContent = 'Loading test lists...';
-    var iframe = document.getElementById("testframe");
-    var testHarness = new WebGLTestHarnessModule.TestHarness(
-        iframe,
-        '00_test_list.txt',
-        function(type, msg, success) {
-          return reporter.reportFunc(type, msg, success);
-        },
-        OPTIONS);
-    // Make timeout delay much higher when running under valgrind.
-    testHarness.setTimeoutDelay(20000);
-    window.webglTestHarness = testHarness;
-  }
-
-  SimpleTest.requestLongerTimeout(requestLongerTimeoutLen);
-  SimpleTest.requestFlakyTimeout("We're embedding the WebGL test harness, which uses timeouts internally, so we have to abide. :(");
-
-  var statusElem = document.getElementById("status");
-  var statusTextNode = document.createTextNode('');
-  statusElem.appendChild(statusTextNode);
-
-  var expectedtofailElem = document.getElementById("expectedtofail");
-  var expectedtofailTextNode = document.createTextNode('');
-  expectedtofailElem.appendChild(expectedtofailTextNode);
-
-  var ignoredtestsElem = document.getElementById("ignoredtests");
-  var ignoredtestsTextNode = document.createTextNode('');
-  ignoredtestsElem.appendChild(ignoredtestsTextNode);
-
-  // Windows uses the ANGLE library for rendering. Until everything is perfect, this means a different set of
-  // failing tests. It's easier to do a platform check for Windows than for ANGLE itself.
-  // Moreover, we currently also have different tests failing on Mac and on Linux,
-  // presumably due to differences in the drivers.
-  var failingTestsFilename = null;
-  var skippedTestsFilename = null;
-  switch (kOS) {
-    case OS_WINDOWS: {
-      if (kGLDriver == GLDRIVER_MSBASICRENDER) {
-        failingTestsFilename = 'failing_tests_windows_msbasicrender.txt';
-      } else {
-        failingTestsFilename = 'failing_tests_windows.txt';
-      }
-
-      if (kOSVersion >= 6.0) // 6.0 is Vista
-        skippedTestsFilename = 'skipped_tests_win_vista.txt'
-      else // XP
-        skippedTestsFilename = 'skipped_tests_winxp.txt';
-        
-      break;
-    }
-    case OS_MAC: {
-      if (kOSVersion == 10.8)
-        failingTestsFilename = 'failing_tests_mac_mtnlion.txt';
-      else
-        failingTestsFilename = 'failing_tests_mac.txt';
-        
-      break;
-    }
-    case OS_LINUX: {
-      switch (kGLDriver) {
-        case GLDRIVER_MESA:
-          failingTestsFilename = 'failing_tests_linux_mesa.txt';
-          skippedTestsFilename = 'skipped_tests_linux_mesa.txt';
-          break;
-        case GLDRIVER_NVIDIA:
-          failingTestsFilename = 'failing_tests_linux_nvidia.txt';
-          break;
-        default:
-          failingTestsFilename = 'failing_tests_linux.txt';
-          skippedTestsFilename = 'skipped_tests_linux.txt';
-          break;
-      }
-      break;
-    }
-    case OS_ANDROID: {
-      switch (kGLDriver) {
-        case GLDRIVER_NVIDIA:
-          failingTestsFilename = 'failing_tests_android_nvidia.txt';
-          skippedTestsFilename = 'skipped_tests_android.txt';
-          break;
-        case GLDRIVER_X86EMULATOR:
-          failingTestsFilename = 'failing_tests_android_x86.txt';
-          skippedTestsFilename = 'skipped_tests_android_x86.txt';
-          break;
-        default:
-          failingTestsFilename = 'failing_tests_android.txt';
-          skippedTestsFilename = 'skipped_tests_android.txt';
-          break;
-      }
-      break;
-    }
-  }
-  
-  info('Failing tests file: ' + failingTestsFilename);
-  info('Skipped tests file: ' + skippedTestsFilename);
-  
-  function LoadNewlineSepFile(filename) {
-    var lines;
-    try {
-      lines = loadTextFileSynchronous(filename)
-              .replace(/\r/g, '') // convert to unix line breaks
-              .split('\n');
-    }
-    catch(e) {
-      // Request failed for some reason.
-      ok(false, 'Loading \'' + filename + '\' failed: ' + e);
-      return [];
-    }
-    
-    // Remove comments and trim whitespace.
-    var retLines = [];
-    for (var i = 0; i < lines.length; i++) {
-      var line = lines[i];
-      line = line.split('#', 1)[0].trim();
-      if (!line.length)
-        continue;
-      
-      retLines.push(line);
-    }
-    
-    return retLines;
-  };
-
-  var testsExpectedToFail = [];
-  if (failingTestsFilename)
-    testsExpectedToFail = LoadNewlineSepFile(failingTestsFilename);
-  
-  var testsToSkip = [];
-  if (skippedTestsFilename)
-    testsToSkip = LoadNewlineSepFile(skippedTestsFilename);
-    
-  var testsToIgnore = [];
-  
-  info('Tests to fail: ' + testsExpectedToFail.length + (testsExpectedToFail.length ? ':' : ''));
-  for (var i = 0; i < testsExpectedToFail.length; i++) {
-    var test = testsExpectedToFail[i];
-    info('  ' + test);
-  }
-  info('Tests to skip: ' + testsToSkip.length + (testsToSkip.length ? ':' : ''));
-  for (var i = 0; i < testsToSkip.length; i++) {
-    var test = testsToSkip[i];
-    info('  ' + test);
-  }
-  info('Tests to ignore: ' + testsToIgnore.length + (testsToIgnore.length ? ':' : ''));
-  for (var i = 0; i < testsToIgnore.length; i++) {
-    var test = testsToIgnore[i];
-    info('  ' + test);
-  }
-
-  runTestSuite();
-}
-
-</script>
-</head>
-<body onload="start();">
-<p id="display"></p>
-<div id="content" style="display: none">
-
-</div>
-<table border="2px">
-  <tr style="height: 500px;">
-    <td style="width: 500px;">
-      <iframe id="testframe" scrolling="no" width="500px" height="500px"></iframe>
-    </td>
-    <td>
-      <table>
-        <tr>
-          <td><h4>WebGL Conformance Test Runner</h4></td>
-        </tr>
-        <tr>
-          <td>
-            <div style="border: 1px">
-              <b>Status:</b> <div><span id="status"></span></div><br />
-              <b>Results:</b>
-              <div><span id="results-default"></span></div>
-              <br />
-              <div><span id="expectedtofail"></span></div>
-              <br />
-              <div><span id="ignoredtests"></span></div>
-            </div>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2">
-      <div style="text-align: left; width: 100%; height: 100%; overflow: auto;">
-        <div><ul id="results"></ul></div>
-      </div>
-    </td>
-  </tr>
-</table>
-<canvas id="webglcheck-default" style="display: none;"></canvas>
-</body>
-</html>

deleted file mode 100644
--- a/dom/canvas/test/webgl-conformance/writemanifest.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Write a Mochitest manifest for WebGL conformance test files.
-
-import os
-from itertools import chain
-
-CONFORMANCE_DIRS = [
-    "conformance",
-    "resources",
-]
-
-def listfiles(dir, rel):
-    """List all files in dir recursively, yielding paths
-    relative to rel.
-    """
-    for root, folders, files in os.walk(dir):
-        for f in files:
-            yield os.path.relpath(os.path.join(root, f), rel)
-
-def writemanifest():
-    script_dir = os.path.dirname(__file__)
-    list_dirs = [os.path.join(script_dir, d) for d in CONFORMANCE_DIRS]
-    with open(os.path.join(script_dir, 'mochitest-conformance-files.ini'), 'w') as f:
-        f.write("""[DEFAULT]
-support-files =
-  %s
-""" % "\n  ".join(sorted(chain.from_iterable(listfiles(d, script_dir)
-                                             for d in list_dirs))))
-
-if __name__ == '__main__':
-    writemanifest()
-