Revert 243714 "Update GPU feature tests to expect no GPU on Wind..."

trunk/src/chrome/test/gpu/gpu_feature_browsertest.cc

Index: trunk/src/chrome/test/gpu/gpu_feature_browsertest.cc
===================================================================
--- trunk/src/chrome/test/gpu/gpu_feature_browsertest.cc	(revision 243748)
+++ trunk/src/chrome/test/gpu/gpu_feature_browsertest.cc	(working copy)
@@ -295,6 +295,10 @@
   RunEventTest(url, kWebGLCreationEvent, false);
 }
 
+#if (defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)) || defined(OS_WIN)
+// http://crbug.com/314745 and http://crbug.com/332341
+#define MultisamplingAllowed DISABLED_MultisamplingAllowed
+#endif
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MultisamplingAllowed) {
   bool expect_blacklisted = false;
   if (gpu::GPUTestBotConfig::GpuBlacklistedOnBot())
@@ -363,7 +367,13 @@
   RunTest(url, "\"FALSE\"", true);
 }
 
-IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) {
+// http://crbug.com/332341
+#if defined(OS_WIN)
+#define MAYBE_Canvas2DAllowed DISABLED_Canvas2DAllowed
+#else
+#define MAYBE_Canvas2DAllowed Canvas2DAllowed
+#endif
+IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_Canvas2DAllowed) {
   // Accelerated canvas 2D is not supported on XP.
   if (gpu::GPUTestBotConfig::CurrentConfigMatches("XP"))
     return;
@@ -438,8 +448,16 @@
   RunEventTest(url, kAcceleratedCanvasCreationEvent, false);
 }
 
+// Fails on XP and Vista bots. http://crbug.com/332341
+#if defined(OS_WIN)
+#define MAYBE_CanOpenPopupAndRenderWithWebGLCanvas \
+  DISABLED_CanOpenPopupAndRenderWithWebGLCanvas
+#else
+#define MAYBE_CanOpenPopupAndRenderWithWebGLCanvas \
+  CanOpenPopupAndRenderWithWebGLCanvas
+#endif
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest,
-                       CanOpenPopupAndRenderWithWebGLCanvas) {
+                       MAYBE_CanOpenPopupAndRenderWithWebGLCanvas) {
   if (gpu::GPUTestBotConfig::GpuBlacklistedOnBot())
     return;