Merge gpu_switching_list into gpu_driver_bug_list.

gpu/config/gpu_driver_bug_list_json.cc

Index: gpu/config/gpu_driver_bug_list_json.cc
diff --git a/gpu/config/gpu_driver_bug_list_json.cc b/gpu/config/gpu_driver_bug_list_json.cc
index 49d34f1b568b44143b93bbd3c4916a5e8f08359f..44d482acf7a57bdbfbc6f0bc543f17aed9faa5fa 100644
--- a/gpu/config/gpu_driver_bug_list_json.cc
+++ b/gpu/config/gpu_driver_bug_list_json.cc
@@ -19,7 +19,7 @@ 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,
@@ -634,6 +634,35 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
       "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"
+      ]
     }
   ]
 }