Mark conformance_textures_tex_image_and_sub_image_2d_with_video as FLAKY

BUG=104772
TEST=
TBR=kbr
Review URL: http://codereview.chromium.org/8669016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111300 0039d316-1c4b-4281-b951-d872f2087c98

chrome/test/gpu/webgl_conformance_test_expectations.txt

@@ -38,3 +38,5 @@
 // FLAKY TESTS
 // -----------------------------------------------------------------------------
 
+104772 MAC WIN LINUX : conformance_textures_tex_image_and_sub_image_2d_with_video = PASS FAIL
+

chrome/test/gpu/webgl_conformance_test_list_autogen.h

@@ -281,7 +281,7 @@ CONFORMANCE_TEST(conformance_textures_tex_image_and_sub_image_2d_with_image_data
   "conformance/textures/tex-image-and-sub-image-2d-with-image-data.html");
 CONFORMANCE_TEST(conformance_textures_tex_image_and_sub_image_2d_with_image,
   "conformance/textures/tex-image-and-sub-image-2d-with-image.html");
-CONFORMANCE_TEST(conformance_textures_tex_image_and_sub_image_2d_with_video,
+CONFORMANCE_TEST(FLAKY_conformance_textures_tex_image_and_sub_image_2d_with_video,
   "conformance/textures/tex-image-and-sub-image-2d-with-video.html");
 CONFORMANCE_TEST(conformance_textures_tex_image_and_uniform_binding_bugs,
   "conformance/textures/tex-image-and-uniform-binding-bugs.html");