Merge gpu_switching_list into gpu_driver_bug_list.

gpu/config/gpu_driver_bug_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 a certain driver bug exists in the current system.
 // The format of a valid gpu_driver_bug_list.json file is defined in
 // <gpu/config/gpu_control_list_format.txt>.
 // The supported "features" can be found in
 // <gpu/config/gpu_driver_bug_workaround_type.h>.
 
 #include "gpu/config/gpu_control_list_jsons.h"
 
 #define LONG_STRING_CONST(...) #__VA_ARGS__
 
 namespace gpu {
 
 const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
 
 {
   "name": "gpu driver bug list",
   // Please update the version number whenever you change this file.
-  "version": "2.26",
+  "version": "3.0",
   "entries": [
     {
       "id": 1,
       "description": "Imagination driver doesn't like uploading lots of buffer data constantly",
       "os": {
         "type": "android"
       },
       "gl_vendor": {
         "op": "beginwith",
         "value": "Imagination"
@@ skipping 594 matching lines @@
       "os": {
         "type": "chromeos"
       },
       "cpu_info": {
         "op": "=",
         "value": "ARM"  // TODO(piman): change to GL_VENDOR/GL_RENDERER switch
       },
       "features": [
         "use_virtualized_gl_contexts"
       ]
+    },
+    {
+      "id": 48,
+      "description": "Force to use discrete GPU on older MacBookPro models.",
+      "cr_bugs": [113703],
+      "os": {
+        "type": "macosx",
+        "version": {
+          "op": ">=",
+          "value": "10.7"
+        }
+      },
+      "machine_model": {
+        "name": {
+          "op": "=",
+          "value": "MacBookPro"
+        },
+        "version": {
+          "op": "<",
+          "value": "8"
+        }
+      },
+      "gpu_count": {
+        "op": "=",
+        "value": "2"
+      },
+      "features": [
+        "force_discrete_gpu"
+      ]
     }
   ]
 }
 
 );  // LONG_STRING_CONST macro
 
 }  // namespace gpu