Disable certain gpu feature tests for certain bots.

chrome/test/gpu/gpu_feature_browsertest.cc

Index: chrome/test/gpu/gpu_feature_browsertest.cc
===================================================================
--- chrome/test/gpu/gpu_feature_browsertest.cc	(revision 124973)
+++ chrome/test/gpu/gpu_feature_browsertest.cc	(working copy)
@@ -18,6 +18,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_switches.h"
+#include "content/test/gpu/gpu_test_config.h"
 #include "net/base/net_util.h"
 #include "ui/gfx/gl/gl_switches.h"
 
@@ -224,6 +225,15 @@
   if (use_gl == gfx::kGLImplementationOSMesaName)
     return;
 
+#if defined(OS_LINUX)
+  // Linux Intel uses mesa driver, where multisampling is not supported.
+  GPUTestBotConfig test_bot;
+  test_bot.LoadCurrentConfig(NULL);
+  const std::vector<uint32>& gpu_vendor = test_bot.gpu_vendor();
+  if (gpu_vendor.size() == 1 && gpu_vendor[0] == 0x8086)
+    return;
+#endif
+
   const FilePath url(FILE_PATH_LITERAL("feature_multisampling.html"));
   RunTest(url, "\"TRUE\"", true);
 }
@@ -276,7 +286,16 @@
   EXPECT_EQ(type, 0);
 
   const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
-  RunTest(url, EXPECT_GPU_SWAP_BUFFERS);
+
+  GpuResultFlags expectations = EXPECT_GPU_SWAP_BUFFERS;
+#if defined(OS_WIN)
+  // Accelerated canvas 2D is not supported on XP.
+  GPUTestBotConfig test_bot;
+  test_bot.LoadCurrentConfig(NULL);
+  if (test_bot.os() == GPUTestConfig::kOsWinXP)
+    expectations = EXPECT_NO_GPU_PROCESS;
+#endif
+  RunTest(url, expectations);
 }
 
 IN_PROC_BROWSER_TEST_F(Canvas2DEnabledTest, Canvas2DBlocked) {