Tighten the blacklist on VMWare on OS X

There will no such thing as blacklisting just FCM in the future, so
first we will change these configurations to disable everything (so
they'll be like WinXP should be).

Fix up a number of tests that don't work when there is no GPU
process. It's not clear how these tests work on WinXP, so add a
temporary log statement in one of these tests so we can figure
out why they are passing on WinXP (they do not pass locally when
the GPU is blacklisted).

BUG=286038

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

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

1 files changed, 19 insertions, 3 deletions

diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc
index ac0b590..d20357e 100644
--- a/chrome/test/gpu/gpu_feature_browsertest.cc
+++ b/chrome/test/gpu/gpu_feature_browsertest.cc
@@ -169,11 +169,13 @@ class GpuFeatureTest : public InProcessBrowserTest {
   std::string trace_events_json_;
 };
 
-#if defined(OS_WIN) || defined(ADDRESS_SANITIZER) || defined(USE_AURA)
+#if defined(OS_WIN) || defined(ADDRESS_SANITIZER) || defined(USE_AURA) || \
+    defined(OS_MACOSX)
 // This test is flaky on Windows. http://crbug.com/177113
 // Also fails under AddressSanitizer. http://crbug.com/185178
 // It fundamentally doesn't test the right thing on Aura.
 // http://crbug.com/280675
+// This does not work with software compositing on Mac. http://crbug.com/286038
 #define MAYBE_AcceleratedCompositingAllowed DISABLED_AcceleratedCompositingAllowed
 #else
 #define MAYBE_AcceleratedCompositingAllowed AcceleratedCompositingAllowed
@@ -298,8 +300,13 @@ IN_PROC_BROWSER_TEST_F(WebGLTest, WebGLDisabled) {
 #define MultisamplingAllowed DISABLED_MultisamplingAllowed
 #endif
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MultisamplingAllowed) {
-  EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
-      gpu::GPU_FEATURE_TYPE_MULTISAMPLING));
+  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.
   if (gfx::GetGLImplementation() != gfx::kGLImplementationOSMesaGL)
@@ -380,6 +387,9 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) {
     expected_state = BLACKLISTED;
 #endif
 
+  if (gpu::GPUTestBotConfig::GpuBlacklistedOnBot())
+    expected_state = BLACKLISTED;
+
 #if defined(USE_AURA)
   // Canvas 2D is always disabled in software compositing mode, make sure it is
   // marked as such if it wasn't blacklisted already.
@@ -434,6 +444,9 @@ IN_PROC_BROWSER_TEST_F(Canvas2DDisabledTest, Canvas2DDisabled) {
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest,
                        CanOpenPopupAndRenderWithWebGLCanvas) {
+  if (gpu::GPUTestBotConfig::GpuBlacklistedOnBot())
+    return;
+
   const base::FilePath url(FILE_PATH_LITERAL("webgl_popup.html"));
   RunTest(url, "\"SUCCESS\"", false);
 }
@@ -508,6 +521,9 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, IOSurfaceReuse) {
   if (!IOSurfaceSupport::Initialize())
     return;
 
+  if (gpu::GPUTestBotConfig::GpuBlacklistedOnBot())
+    return;
+
   const base::FilePath url(
       FILE_PATH_LITERAL("feature_compositing_static.html"));
   base::FilePath test_path = gpu_test_dir_.Append(url);