Update GPU feature tests to expect no GPU on Windows <=Vista

BUG=243476

Review URL: https://codereview.chromium.org/128893002

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

chrome/test/gpu/gpu_feature_browsertest.cc

@@ -295,10 +295,6 @@ IN_PROC_BROWSER_TEST_F(WebGLTest, WebGLDisabled) {
   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())
@@ -367,13 +363,7 @@ IN_PROC_BROWSER_TEST_F(WebGLMultisamplingTest, MultisamplingDisabled) {
   RunTest(url, "\"FALSE\"", true);
 }
 
-// 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) {
+IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) {
   // Accelerated canvas 2D is not supported on XP.
   if (gpu::GPUTestBotConfig::CurrentConfigMatches("XP"))
     return;
@@ -448,16 +438,8 @@ IN_PROC_BROWSER_TEST_F(Canvas2DDisabledTest, Canvas2DDisabled) {
   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,
-                       MAYBE_CanOpenPopupAndRenderWithWebGLCanvas) {
+                       CanOpenPopupAndRenderWithWebGLCanvas) {
   if (gpu::GPUTestBotConfig::GpuBlacklistedOnBot())
     return;
 

gpu/config/gpu_test_config.cc

@@ -12,6 +12,8 @@
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
+#elif defined(OS_WIN)
+#include "base/win/windows_version.h"
 #endif
 
 namespace gpu {
@@ -279,8 +281,12 @@ bool GPUTestBotConfig::GpuBlacklistedOnBot() {
   if (CurrentConfigMatches("MAC VMWARE") && base::mac::IsOSLionOrEarlier()) {
     return true;
   }
+#elif defined(OS_WIN)
+  // Blacklist rule #79 disables all Gpu acceleration before Windows 7.
+  if (base::win::GetVersion() <= base::win::VERSION_VISTA) {
+    return false;
+  }
 #endif
-  // TODO(ccameron): This should be true on Windows XP as well.
   return false;
 }