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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/trace_event_analyzer.h"
@@ skipping 277 matching lines @@
     command_line->AppendSwitch(switches::kDisableExperimentalWebGL);
 #endif
   }
 };
 
 IN_PROC_BROWSER_TEST_F(WebGLTest, WebGLDisabled) {
   const base::FilePath url(FILE_PATH_LITERAL("feature_webgl.html"));
   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())
     expect_blacklisted = true;
 
   EXPECT_EQ(expect_blacklisted,
             GpuDataManager::GetInstance()->IsFeatureBlacklisted(
                 gpu::GPU_FEATURE_TYPE_MULTISAMPLING));
 
   // Multisampling is not supported if running on top of osmesa.
@@ skipping 48 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(WebGLMultisamplingTest, MultisamplingDisabled) {
   // Multisampling fails on virtualized mac os.
   if (gpu::GPUTestBotConfig::CurrentConfigMatches("MAC VMWARE"))
     return;
 
   const base::FilePath url(FILE_PATH_LITERAL("feature_multisampling.html"));
   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;
 
   enum Canvas2DState {
     ENABLED,
     BLACKLISTED,  // Disabled via the blacklist.
     DISABLED,     // Not disabled via the blacklist, but expected to be disabled
                   // by configuration.
   } expected_state = ENABLED;
@@ skipping 54 matching lines @@
     GpuFeatureTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kDisableAccelerated2dCanvas);
   }
 };
 
 IN_PROC_BROWSER_TEST_F(Canvas2DDisabledTest, Canvas2DDisabled) {
   const base::FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
   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;
 
   const base::FilePath url(FILE_PATH_LITERAL("webgl_popup.html"));
   RunTest(url, "\"SUCCESS\"", false);
 }
 
 // crbug.com/176466
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest,
                        DISABLED_CanOpenPopupAndRenderWith2DCanvas) {
@@ skipping 133 matching lines @@
               "%d (resize offset %d): IOSurface width %d -> %d; Creates %d "
               "Expected %d", offset_i, offsets[offset_i],
               old_width, new_width, num_creates, expected_creates);
     }
   }
   LOG(INFO) << "finished test";
 }
 #endif
 
 }  // namespace