Unify GPU raster and accelerated canvas blacklists on Android.

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 b82205644e4b13a8cda32f181034031de00085a3..913058ed501b4bb6dd09640d2d20c13c6616fff1 100644
--- a/gpu/config/software_rendering_list_json.cc
+++ b/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": "9.16",
+  "version": "9.17",
   "entries": [
     {
       "id": 1,
@@ -621,22 +621,6 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
       ]
     },
     {
-      "id": 62,
-      "description": "Accelerated 2D canvas buggy on old Qualcomm Adreno",
-      "cr_bugs": [161575],
-      "os": {
-        "type": "android"
-      },
-      "gl_renderer": ".*Adreno.*",
-      "driver_version": {
-        "op": "<",
-        "value": "4.1"
-      },
-      "features": [
-        "accelerated_2d_canvas"
-      ]
-    },
-    {
       "id": 64,
       "description": "Hardware video decode is only supported in win7+",
       "cr_bugs": [159458],
@@ -1035,7 +1019,7 @@ LONG_STRING_CONST(
     },
     {
       "id": 96,
-      "description": "GPU rasterization whitelist",
+      "description": "Blacklist GPU raster/canvas on all except known good GPUs and newer Android releases",
       "cr_bugs": [362779,424970],
       "os": {
         "type": "android"
@@ -1090,7 +1074,8 @@ LONG_STRING_CONST(
         }
       ],
       "features": [
-        "gpu_rasterization"
+        "gpu_rasterization",
+        "accelerated_2d_canvas"
       ]
     },
     {
@@ -1114,7 +1099,8 @@ LONG_STRING_CONST(
       "cr_bugs": [407144],
       "gl_renderer": ".*Mali-T604.*",
       "features": [
-        "gpu_rasterization"
+        "gpu_rasterization",
+        "accelerated_2d_canvas"
       ]
     },
     {