Revert 227977 "Enable GPU control lists in tests."

trunk/src/gpu/config/software_rendering_list_json.cc

Index: trunk/src/gpu/config/software_rendering_list_json.cc
===================================================================
--- trunk/src/gpu/config/software_rendering_list_json.cc	(revision 228013)
+++ trunk/src/gpu/config/software_rendering_list_json.cc	(working copy)
@@ -18,7 +18,7 @@
 {
   "name": "software rendering list",
   // Please update the version number whenever you change this file.
-  "version": "6.12",
+  "version": "6.11",
   "entries": [
     {
       "id": 1,
@@ -138,12 +138,6 @@
             "op": ">=",
             "value": "7.15.10.1624"
           }
-        },
-        {
-          "driver_vendor": {
-            "op": "=",
-            "value": "osmesa"
-          }
         }
       ],
       "features": [
@@ -335,14 +329,6 @@
         "op": "<",
         "value": "7.11"
       },
-      "exceptions": [
-        {
-          "driver_vendor": {
-            "op": "=",
-            "value": "osmesa"
-          }
-        }
-      ],
       "features": [
         "all"
       ]
@@ -775,12 +761,6 @@
             "op": ">=",
             "value": "7.15.10.1624"
           }
-        },
-        {
-          "driver_vendor": {
-            "op": "=",
-            "value": "osmesa"
-          }
         }
       ],
       "features": [
@@ -1084,8 +1064,6 @@
         "all"
       ]
     },
-)  // String split to avoid MSVC char limit.
-LONG_STRING_CONST(
     {
       "id": 75,
       "description": "Texture sharing not supported on AMD Switchable GPUs due to driver issues",
@@ -1098,6 +1076,8 @@
         "texture_sharing"
       ]
     },
+)  // String split to avoid MSVC char limit.
+LONG_STRING_CONST(
     {
       "id": 76,
       "description": "WebGL is disabled on Android unless GPU reset notification is supported",
@@ -1149,21 +1129,6 @@
       "features": [
         "accelerated_video_decode"
       ]
-    },
-    {
-      "id": 79,
-      "description": "Disable force compositing mode on all Windows versions prior to Vista.",
-      "cr_bugs": [273920],
-      "os": {
-        "type": "win",
-        "version": {
-          "op": "<",
-          "value": "6.0"
-        }
-      },
-      "features": [
-        "force_compositing_mode"
-      ]
     }
   ]
 }
@@ -1171,3 +1136,4 @@
 );  // LONG_STRING_CONST macro
 
 }  // namespace gpu
+