Remove blacklisting of Mac OS 10.6 and 10.7.

Add blacklisting of VMWare driver on 10.7 because it hangs.

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

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

TBR=vangelis
BUG=266186

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235863 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;
@@ -272,15 +268,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 for an unknown reason.
+// 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 has 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::IsOSLion())
+    return;
 #elif defined(OS_WIN)
   if (base::win::GetVersion() >= base::win::VERSION_VISTA)
     expected_mode = THREADED;

gpu/config/software_rendering_list_json.cc

@@ -18,7 +18,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
 {
   "name": "software rendering list",
   // Please update the version number whenever you change this file.
-  "version": "6.14",
+  "version": "6.15",
   "entries": [
     {
       "id": 1,
@@ -788,21 +788,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+.",
@@ -998,6 +983,22 @@ LONG_STRING_CONST(
       "features": [
         "texture_sharing"
       ]
+    },
+    {
+      "id": 81,
+      "description": "Apple software renderer used under VMWare hangs on Mac OS 10.7.",
+      "cr_bugs": [230931],
+      "os": {
+        "type": "macosx",
+        "version": {
+          "op": "=",
+          "value": "10.7"
+        }
+      },
+      "vendor_id": "0x15ad",
+      "features": [
+        "force_compositing_mode"
+      ]
     }
   ]
 }