Fix machine_model behaviors in gpu blacklist.

gpu/config/software_rendering_list_json.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Determines whether certain gpu-related features are blacklisted or not.
 // The format of a valid software_rendering_list.json file is defined in
 // <gpu/config/gpu_control_list_format.txt>.
 // The supported "features" can be found in <gpu/config/gpu_blacklist.cc>.
 
 #include "gpu/config/gpu_control_list_jsons.h"
 
 #define LONG_STRING_CONST(...) #__VA_ARGS__
 
 namespace gpu {
 
 const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
 
 {
   "name": "software rendering list",
   // Please update the version number whenever you change this file.
-  "version": "7.7",
+  "version": "8.0",
   "entries": [
     {
       "id": 1,
       "description": "ATI Radeon X1900 is not compatible with WebGL on the Mac",
       "webkit_bugs": [47028],
       "os": {
         "type": "macosx"
       },
       "vendor_id": "0x1002",
       "device_id": ["0x7249"],
@@ skipping 910 matching lines @@
       "id": 83,
       "description": "Samsung Gaxlaxy NOTE II is too buggy to use for video decoding",
       "cr_bugs": [308721],
       "os": {
         "type": "android",
         "version": {
           "op": "<=",
           "value": "4.1.2"
         }
       },
-      "machine_model": {
-        "name": {
-          "op": "=",
-          "value": "GT-N7100"
-        }
-      },
+      "machine_model_name": ["GT-N7100"],
       "features": [
         "accelerated_video_decode"
       ]
     },
     {
       "id": 85,
       "description": "Samsung Gaxlaxy S4 is too buggy to use for video decoding",
       "cr_bugs": [329072],
       "os": {
         "type": "android"
       },
-      "machine_model": {
-        "name": {
-          "op": "=",
-          "value": "SCH-I545"
-        }
-      },
+      "machine_model_name": ["SCH-I545"],
       "features": [
         "accelerated_video_decode"
       ]
     },
     {
       "id": 86,
       "description": "Intel Graphics Media Accelerator 3150 causes the GPU process to hang running WebGL",
       "cr_bugs": [305431],
       "os": {
         "type": "win"
@@ skipping 146 matching lines @@
       "features": [
         "all"
       ]
     },
     {
       "id": 96,
       "description": "GPU rasterization is whitelisted on N4, N5, N7 and Moto X",
       "cr_bugs": [362779],
       "exceptions": [
         {
-          "machine_model": {
-            "name": {
-              "op": "=",
-              "value": "Nexus 4"
-            }
-          }
-        },
-        {
-          "machine_model": {
-            "name": {
-              "op": "=",
-              "value": "Nexus 5"
-            }
-          }
-        },
-        {
-          "machine_model": {
-            "name": {
-              "op": "=",
-              "value": "Nexus 7"
-            }
-          }
-        },
-        {
-          "machine_model": {
-            "name": {
-              "op": "=",
-              "value": "XT1049"
-            }
-          }
-        },
-        {
-          "machine_model": {
-            "name": {
-              "op": "=",
-              "value": "XT1050"
-            }
-          }
-        },
-        {
-          "machine_model": {
-            "name": {
-              "op": "=",
-              "value": "XT1052"
-            }
-          }
-        },
-        {
-          "machine_model": {
-            "name": {
-              "op": "=",
-              "value": "XT1053"
-            }
-          }
-        },
-        {
-          "machine_model": {
-            "name": {
-              "op": "=",
-              "value": "XT1055"
-            }
-          }
-        },
-        {
-          "machine_model": {
-            "name": {
-              "op": "=",
-              "value": "XT1056"
-            }
-          }
-        },
-        {
-          "machine_model": {
-            "name": {
-              "op": "=",
-              "value": "XT1058"
-            }
-          }
-        },
-        {
-          "machine_model": {
-            "name": {
-              "op": "=",
-              "value": "XT1060"
-            }
-          }
+          "machine_model_name": ["Nexus 4", "Nexus 5", "Nexus 7",
+                                 "XT1049", "XT1050", "XT1052", "XT1053",
+                                 "XT1055", "XT1056", "XT1058", "XT1060"]
         }
       ],
       "features": [
         "gpu_rasterization"
       ]
     }
   ]
 }
 
 );  // LONG_STRING_CONST macro
 
 }  // namespace gpu