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

1 files changed, 16 insertions, 15 deletions

diff --git a/gpu/config/software_rendering_list_json.cc b/gpu/config/software_rendering_list_json.cc
index ae3f014..c583714 100644
--- a/gpu/config/software_rendering_list_json.cc
+++ b/gpu/config/software_rendering_list_json.cc
@@ -773,21 +773,6 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
       ]
     },
     {
-      "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+.",
       "cr_bugs": [169470],
@@ -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"
+      ]
     }
   ]
 }