Revert 221240 "Remove compositing blacklisting of 10.7 and 10.6."

> Remove compositing blacklisting of 10.7 and 10.6.
> 
> Also disable vsync to see if this improves performance.
> 
> BUG=266186
> TBR=kbr@chromium.org, zmo@chromium.org
> 
> Review URL: https://chromiumcodereview.appspot.com/23477037

TBR=ccameron@chromium.org

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

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

gpu/config/software_rendering_list_json.cc

@@ -89,7 +89,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
 {
   "name": "software rendering list",
   // Please update the version number whenever you change this file.
-  "version": "6.8",
+  "version": "6.9",
   "entries": [
     {
       "id": 1,
@@ -986,6 +986,21 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
         "force_compositing_mode"
       ]
     },
+    {
+      "id": 66,
+      "description": "Force compositing mode is unstable in MacOSX earlier than 10.8.",
+      "cr_bugs": [174101],
+      "os": {
+        "type": "macosx",
+        "version": {
+          "op": "<",
+          "number": "10.8"
+        }
+      },
+      "features": [
+        "force_compositing_mode"
+      ]
+    },
     {
       "id": 67,
       "description": "Accelerated 2D Canvas is not supported on WinXP.",

tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py

@@ -97,9 +97,6 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
     args = super(DesktopBrowserBackend, self).GetBrowserStartupArgs()
     args.append('--remote-debugging-port=%i' % self._port)
     args.append('--enable-crash-reporter-for-testing')
-    # Temporarily disable vsync to see the effect on performance results.
-    # http://crbug.com/281709
-    args.append('--disable-gpu-vsync')
     if not self.is_content_shell:
       args.append('--window-size=1280,1024')
       if self._flash_path: