Enforce FCM settings via the blacklist rather than in-code version checks.

gpu/config/software_rendering_list_json.cc

Index: gpu/config/software_rendering_list_json.cc
diff --git a/gpu/config/software_rendering_list_json.cc b/gpu/config/software_rendering_list_json.cc
index a454ded6d9238b5311db87252af14e2fb8b41533..19a05ac9049c4bf54983c8e4077fab6e3bfaef12 100644
--- a/gpu/config/software_rendering_list_json.cc
+++ b/gpu/config/software_rendering_list_json.cc
@@ -930,23 +930,6 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
       ]
     },
     {
-      "id": 65,
-      "description": "Force compositing mode is unstable in Win Vista.",
-      "cr_bugs": [170421],
-      "os": {
-        "type": "win",
-        "version": {
-          "op": "=",
-          "value": "6.0"
-        }
-      },
-      "features": [
-        "flash_3d",
-        "flash_stage3d",
-        "force_compositing_mode"
-      ]
-    },
-    {
       "id": 66,
       "description": "Force compositing mode is unstable in MacOSX earlier than 10.8.",
       "cr_bugs": [174101],
@@ -1157,16 +1140,18 @@ LONG_STRING_CONST(
     },
     {
       "id": 79,
-      "description": "Disable force compositing mode on all Windows versions prior to Vista.",
-      "cr_bugs": [273920],
+      "description": "Disable force compositing mode on all Windows versions prior to and including Vista.",
+      "cr_bugs": [273920, 170421],
       "os": {
         "type": "win",
         "version": {
-          "op": "<",
+          "op": "<=",
           "value": "6.0"
         }
       },
       "features": [
+        "flash_3d",
+        "flash_stage3d",
         "force_compositing_mode"
       ]
     }