Enable GPU control lists in tests on Windows.

chrome/test/gpu/gpu_feature_browsertest.cc

Index: chrome/test/gpu/gpu_feature_browsertest.cc
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc
index 6263e2d69d2f3166fb0f43ccd4a597fc6b979872..0cbe4281075e3c5b8abc76570d85c4297b6d40e9 100644
--- a/chrome/test/gpu/gpu_feature_browsertest.cc
+++ b/chrome/test/gpu/gpu_feature_browsertest.cc
@@ -216,7 +216,7 @@ class AcceleratedCompositingBlockedTest : public GpuFeatureTest {
 #endif
 
 IN_PROC_BROWSER_TEST_F(AcceleratedCompositingBlockedTest,
-    MAYBE_AcceleratedCompositingBlocked) {
+                       MAYBE_AcceleratedCompositingBlocked) {
   EXPECT_TRUE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
       gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING));
 
@@ -367,11 +367,23 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) {
   if (gpu::GPUTestBotConfig::CurrentConfigMatches("XP"))
     return;
 
-  EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
-      gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS));
+  bool is_blacklisted = false;
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+  // Blacklist rule #24 disables accelerated_2d_canvas on Linux.
+  // TODO(gab): Enable GPU control lists on Linux.
+  // is_blacklisted = true;
+#elif defined(OS_WIN)
+  // Blacklist rule #67 disables accelerated_2d_canvas on XP.
+  if (base::win::GetVersion() < base::win::VERSION_VISTA)
+    is_blacklisted = true;
+#endif
+
+  EXPECT_EQ(is_blacklisted,
+            GpuDataManager::GetInstance()->IsFeatureBlacklisted(
+                gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS));
 
   const base::FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
-  RunEventTest(url, kAcceleratedCanvasCreationEvent, true);
+  RunEventTest(url, kAcceleratedCanvasCreationEvent, !is_blacklisted);
 }
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DBlocked) {