Remove blacklisting of Mac OS 10.6 and 10.7.

Add blacklisting of VMWare driver on 10.6 and 10.7 because it hangs.

Disable compositing expectation test on 10.6 and 10.7 because it will
give different results depending on whether it is running on
a VM or real hardware.

Expand disabling of PhishingClassifierTest because it
flakes on all Mac versions now.

TBR=vangelis
BUG=266186

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

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

chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc

@@ -28,10 +28,6 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "url/gurl.h"
 
-#if defined(OS_MACOSX)
-#include "base/mac/mac_util.h"
-#endif
-
 using ::testing::AllOf;
 using ::testing::Contains;
 using ::testing::Not;
@@ -201,8 +197,14 @@ class PhishingClassifierTest : public InProcessBrowserTest {
   const std::string page_term_login_;
 };
 
-// Flaky on Mac Blink bots: crbug.com/316709
-IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, TestClassification) {
+// This test flakes on Mac with force compositing mode.
+// http://crbug.com/316709
+#if defined(OS_MACOSX)
+#define MAYBE_TestClassification DISABLED_TestClassification
+#else
+#define MAYBE_TestClassification TestClassification
+#endif
+IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, MAYBE_TestClassification) {
   host_resolver()->AddRule("*", "127.0.0.1");
 
   // No scorer yet, so the classifier is not ready.
@@ -272,15 +274,14 @@ IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, TestClassification) {
   EXPECT_EQ(PhishingClassifier::kInvalidScore, phishy_score);
 }
 
-IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, DisableDetection) {
+// This test flakes on Mac with force compositing mode.
+// http://crbug.com/316709
 #if defined(OS_MACOSX)
-  if (base::mac::IsOSMountainLionOrLater()) {
-    // This test flakes on 10.8 only for an unknown reason.
-    // http://crbug.com/316709
-    return;
-  }
+#define MAYBE_DisableDetection DISABLED_DisableDetection
+#else
+#define MAYBE_DisableDetection DisableDetection
 #endif
-
+IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, MAYBE_DisableDetection) {
   // No scorer yet, so the classifier is not ready.
   EXPECT_FALSE(classifier_->is_ready());
 

content/browser/gpu/compositor_util_browsertest.cc

@@ -29,8 +29,13 @@ IN_PROC_BROWSER_TEST_F(CompositorUtilTest, CompositingModeAsExpected) {
 #elif defined(OS_ANDROID)
   expected_mode = THREADED;
 #elif defined(OS_MACOSX)
-  if (base::mac::IsOSMountainLionOrLater())
-    expected_mode = THREADED;
+  expected_mode = THREADED;
+  // Lion and SnowLeopard have compositing blacklisted when using the Apple
+  // software renderer, so results will vary depending if this test is being
+  // run in a VM versus actual hardware.
+  // http://crbug.com/230931
+  if (base::mac::IsOSLionOrEarlier())
+    return;
 #elif defined(OS_WIN)
   if (base::win::GetVersion() >= base::win::VERSION_VISTA)
     expected_mode = THREADED;

gpu/config/software_rendering_list_json.cc

@@ -772,21 +772,6 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
         "accelerated_video_decode"
       ]
     },
-    {
-      "id": 66,
-      "description": "Force compositing mode is unstable in MacOSX earlier than 10.8.",
-      "cr_bugs": [174101],
-      "os": {
-        "type": "macosx",
-        "version": {
-          "op": "<",
-          "value": "10.8"
-        }
-      },
-      "features": [
-        "force_compositing_mode"
-      ]
-    },
     {
       "id": 68,
       "description": "VMware Fusion 4 has corrupt rendering with Win Vista+.",
@@ -970,6 +955,22 @@ LONG_STRING_CONST(
       "features": [
         "texture_sharing"
       ]
+    },
+    {
+      "id": 81,
+      "description": "Apple software renderer used under VMWare hangs on Mac OS 10.6 and 10.7.",
+      "cr_bugs": [230931],
+      "os": {
+        "type": "macosx",
+        "version": {
+          "op": "<=",
+          "value": "10.7"
+        }
+      },
+      "vendor_id": "0x15ad",
+      "features": [
+        "force_compositing_mode"
+      ]
     }
   ]
 }