Revert 179962

original cause should be fixed now

> Mark a bunch of tests as failures.
> 
> So GPU bots can turn green.
> 
> BUG=173456,173079
> TEST=gpu bots
> TBR=jochen
> Review URL: https://codereview.chromium.org/12114037

TBR=zmo@chromium.org
Review URL: https://codereview.chromium.org/12096113

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

content/browser/gpu/gpu_crash_browsertest.cc

@@ -26,11 +26,6 @@ class GpuCrashTest : public ContentBrowserTest {
 };
 
 IN_PROC_BROWSER_TEST_F(GpuCrashTest, MANUAL_Kill) {
-#if defined(OS_MACOSX)
-  // crbug.com/173456
-  return;
-#endif
-
   DOMMessageQueue message_queue;
 
   content::GpuDataManagerImpl::GetInstance()->
@@ -57,11 +52,6 @@ IN_PROC_BROWSER_TEST_F(GpuCrashTest, MANUAL_Kill) {
 }
 
 IN_PROC_BROWSER_TEST_F(GpuCrashTest, MANUAL_WebkitLoseContext) {
-#if defined(OS_MACOSX)
-  // crbug.com/173456
-  return;
-#endif
-
   DOMMessageQueue message_queue;
 
   NavigateToURL(

content/test/data/gpu/webgl_conformance_test_expectations.txt

@@ -114,7 +114,7 @@ UNFILED WIN7 INTEL : conformance_misc_delayed_drawing = FAIL
 UNFILED WIN7 INTEL : conformance_textures_texture_clear = FAIL
 UNFILED WIN7 INTEL : conformance_glsl_samplers_glsl_function_texture2dlod = FAIL
 
-// UNFILED WIN7 INTEL : conformance_attribs_gl_disabled_vertex_attrib = FAIL
+UNFILED WIN7 INTEL : conformance_attribs_gl_disabled_vertex_attrib = FAIL
 UNFILED WIN7 INTEL : conformance_extensions_oes_texture_float_with_image_data = FAIL
 UNFILED WIN7 INTEL : conformance_glsl_samplers_glsl_function_texture2dproj = FLAKY
 
@@ -137,9 +137,9 @@ UNFILED MAC INTEL : conformance_glsl_variables_gl_pointcoord = FAIL
 UNFILED MAC INTEL : conformance_limits_gl_max_texture_dimensions = FAIL
 UNFILED MAC INTEL : conformance_rendering_line_loop_tri_fan = FAIL
 
-// UNFILED MAC AMD : conformance_attribs_gl_vertex_attrib = FAIL
-// UNFILED MAC AMD : conformance_attribs_gl_vertexattribpointer_offsets = FAIL
-// UNFILED MAC AMD : conformance_attribs_gl_vertexattribpointer = FAIL
+UNFILED MAC AMD : conformance_attribs_gl_vertex_attrib = FAIL
+UNFILED MAC AMD : conformance_attribs_gl_vertexattribpointer_offsets = FAIL
+UNFILED MAC AMD : conformance_attribs_gl_vertexattribpointer = FAIL
 UNFILED MAC AMD : conformance_misc_type_conversion_test = FAIL
 UNFILED MAC AMD : conformance_renderbuffers_framebuffer_object_attachment = FAIL
 UNFILED MAC AMD : conformance_textures_copy_tex_image_and_sub_image_2d = FAIL
@@ -190,10 +190,3 @@ UNFILED LINUX AMD : conformance_textures_texture_mips = FAIL
 //  Temprory entries: they should be removed once the bugs are fixed.
 //
 ////////////////////////////////////////////////////////////////////////////////
-
-173456 MAC WIN LINUX : conformance_attribs_gl_enable_vertex_attrib = TIMEOUT
-173456 MAC WIN LINUX : conformance_attribs_gl_disabled_vertex_attrib = TIMEOUT
-173456 MAC WIN LINUX : conformance_attribs_gl_vertex_attrib_zero_issues = TIMEOUT
-173456 MAC WIN LINUX : conformance_attribs_gl_vertex_attrib = TIMEOUT
-173456 MAC WIN LINUX : conformance_attribs_gl_vertexattribpointer_offsets = TIMEOUT
-173456 MAC WIN LINUX : conformance_attribs_gl_vertexattribpointer = TIMEOUT