Add semantics to apply gpu blakclist to AMD swichable when a discrete/integrated GPU is in use

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": "8.5",
+  "version": "8.6",
   "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 1053 matching lines @@
         "accelerated_video_decode"
       ]
     },
     {
       "id": 92,
       "description": "Accelerated video decode does not work with the discrete GPU on AMD switchables",
       "cr_bugs": [298968],
       "os": {
         "type": "win"
       },
-      "multi_gpu_style": "amd_switchable",
+      "multi_gpu_style": "amd_switchable_discrete",
       "features": [
         "accelerated_video_decode"
       ]
     },
     {
       "id": 93,
       "description": "GLX indirect rendering (X remoting) is not supported",
       "cr_bugs": [72373],
       "os": {
         "type": "linux"
@@ skipping 87 matching lines @@
       "features": [
         "gpu_rasterization_field_trial"
       ]
     }
   ]
 }
 
 );  // LONG_STRING_CONST macro
 
 }  // namespace gpu