Revert 233191 "Simplify GPU blacklist for WinAura"

Various WebGL-related tests started failing on XP and Vista:
http://build.chromium.org/p/chromium.win/buildstatus?builder=XP%20Tests%20%282%29&number=31628
http://build.chromium.org/p/chromium.win/buildstatus?builder=XP%20Tests%20%283%29&number=25055
http://build.chromium.org/p/chromium.win/buildstatus?builder=Vista%20Tests%20%281%29&number=41714
http://build.chromium.org/p/chromium.win/buildstatus?builder=Vista%20Tests%20%282%29&number=39756
http://build.chromium.org/p/chromium.win/buildstatus?builder=Vista%20Tests%20%283%29&number=35336

Example:

browser\extensions\requirements_checker_browsertest.cc(47): error: Value of: actual_errors
Actual: { "WebGL is not supported.", "CSS3d is not supported." }
Expected: expected_errors
Which is: {}

> Simplify GPU blacklist for WinAura
> 
> The gpu is completely blacklisted on all vista and XP machines with aura. All other blacklisting of them is redundant.
> 
> BUG=315199
> 
> Review URL: https://codereview.chromium.org/58343007

TBR=jbauman@chromium.org

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

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

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.13",
   "entries": [
     {
       "id": 1,
@@ -147,7 +147,92 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
         }
       ],
       "features": [
-        "all"
+        "accelerated_2d_canvas",
+        "accelerated_video",
+        "accelerated_video_decode",
+        "3d_css",
+        "multisampling",
+        "flash_3d",
+        "flash_stage3d",
+        "force_compositing_mode"
+      ]
+    },
+    {
+      "id": 13,
+      "description": "ATI drivers older than 10.6 on Windows XP are possibly unreliable.",
+      "cr_bugs": [74212],
+      "os": {
+        "type": "win",
+        "version": {
+          "op": "=",
+          "value": "5"
+        }
+      },
+      "vendor_id": "0x1002",
+      "driver_version": {
+        "op": "<",
+        "value": "8.741"
+      },
+      "features": [
+        "accelerated_video",
+        "accelerated_video_decode",
+        "3d_css",
+        "multisampling",
+        "flash_3d",
+        "flash_stage3d",
+        "force_compositing_mode"
+      ]
+    },
+    {
+      "id": 14,
+      "description": "NVIDIA drivers older than 257.21 on Windows XP are possibly unreliable.",
+      "cr_bugs": [74212],
+      "os": {
+        "type": "win",
+        "version": {
+          "op": "=",
+          "value": "5"
+        }
+      },
+      "vendor_id": "0x10de",
+      "driver_version": {
+        "op": "<",
+        "value": "6.14.12.5721"
+      },
+      "features": [
+        "accelerated_video",
+        "accelerated_video_decode",
+        "3d_css",
+        "multisampling",
+        "flash_3d",
+        "flash_stage3d",
+        "force_compositing_mode"
+      ]
+    },
+    {
+      "id": 15,
+      "description": "Intel drivers older than 14.42.7.5294 on Windows XP are possibly unreliable.",
+      "cr_bugs": [74212],
+      "os": {
+        "type": "win",
+        "version": {
+          "op": "=",
+          "value": "5"
+        }
+      },
+      "vendor_id": "0x8086",
+      "driver_version": {
+        "op": "<",
+        "value": "6.14.10.5294"
+      },
+      "features": [
+        "accelerated_video",
+        "accelerated_video_decode",
+        "3d_css",
+        "multisampling",
+        "flash_3d",
+        "flash_stage3d",
+        "force_compositing_mode"
       ]
     },
     {
@@ -449,6 +534,21 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
         "accelerated_2d_canvas"
       ]
     },
+    {
+      "id": 41,
+      "description": "Disable 3D (but not Stage3D) in Flash on XP",
+      "cr_bugs": [134885],
+      "os": {
+        "type": "win",
+        "version": {
+          "op": "=",
+          "value": "5"
+        }
+      },
+      "features": [
+        "flash_3d"
+      ]
+    },
     {
       "id": 42,
       "description": "AMD Radeon HD 6490M and 6970M on Snow Leopard are buggy.",
@@ -610,6 +710,46 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
         "all"
       ]
     },
+    {
+      "id": 51,
+      "description": "NVIDIA drivers 6.14.11.9621 is buggy on Windows XP.",
+      "cr_bugs": [152096],
+      "os": {
+        "type": "win",
+        "version": {
+          "op": "=",
+          "value": "5"
+        }
+      },
+      "vendor_id": "0x10de",
+      "driver_version": {
+        "op": "=",
+        "value": "6.14.11.9621"
+      },
+      "features": [
+        "all"
+      ]
+    },
+    {
+      "id": 52,
+      "description": "NVIDIA drivers 6.14.11.8267 is buggy on Windows XP.",
+      "cr_bugs": [152096],
+      "os": {
+        "type": "win",
+        "version": {
+          "op": "=",
+          "value": "5"
+        }
+      },
+      "vendor_id": "0x10de",
+      "driver_version": {
+        "op": "=",
+        "value": "6.14.11.8267"
+      },
+      "features": [
+        "all"
+      ]
+    },
     {
       "id": 53,
       "description": "The Intel GMA500 is too slow for Stage3D.",
@@ -963,6 +1103,23 @@ LONG_STRING_CONST(
         "webgl"
       ]
     },
+    {
+      "id": 77,
+      "description": "Multisampling is reportedly very slow on Quadro NVS 135M/GeForce 8400M GS",
+      "cr_bugs": [279446],
+      "os": {
+        "type": "win",
+        "version": {
+          "op": "=",
+          "value": "5"
+        }
+      },
+      "vendor_id": "0x10de",
+      "device_id": ["0x0429", "0x042b"],
+      "features": [
+        "multisampling"
+      ]
+    },
     {
       "id": 78,
       "description": "Accelerated video decode interferes with GPU blacklist on older Intel drivers",
@@ -982,7 +1139,7 @@ LONG_STRING_CONST(
     },
     {
       "id": 79,
-      "description": "Disable GPU on all Windows versions prior to and including Vista.",
+      "description": "Disable force compositing mode on all Windows versions prior to and including Vista.",
       "cr_bugs": [273920, 170421],
       "os": {
         "type": "win",
@@ -992,7 +1149,9 @@ LONG_STRING_CONST(
         }
       },
       "features": [
-        "all"
+        "flash_3d",
+        "flash_stage3d",
+        "force_compositing_mode"
       ]
     },
     {