Identify the active GPU using GL strings in multiple GPU situation.

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 6dd06c20d7ab731ffb4484143d2926407c2eb516..cb9948d29a61d9b2346eb469d3e935e293465b2c 100644
--- a/gpu/config/software_rendering_list_json.cc
+++ b/gpu/config/software_rendering_list_json.cc
@@ -29,6 +29,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
       },
       "vendor_id": "0x1002",
       "device_id": ["0x7249"],
+      "multi_gpu_category": "any",
       "features": [
         "webgl",
         "flash_3d",
@@ -114,6 +115,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
       },
       "vendor_id": "0x10de",
       "device_id": ["0x0393"],
+      "multi_gpu_category": "any",
       "features": [
         "webgl",
         "flash_3d",
@@ -394,6 +396,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
       },
       "vendor_id": "0x10de",
       "device_id": ["0x0863"],
+      "multi_gpu_category": "any",
       "features": [
         "accelerated_2d_canvas"
       ]
@@ -411,6 +414,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
       },
       "vendor_id": "0x1002",
       "device_id": ["0x6760", "0x6720"],
+      "multi_gpu_category": "any",
       "features": [
         "webgl"
       ]
@@ -506,6 +510,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
       "multi_gpu_style": "optimus",
       "vendor_id": "0x10de",
       "device_id": ["0x0fd5"],
+      "multi_gpu_category": "any",
       "features": [
         "flash_3d",
         "flash_stage3d"
@@ -707,6 +712,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
       },
       "vendor_id": "0x10de",
       "device_id": ["0x0a29", "0x0861", "0x0863"],
+      "multi_gpu_category": "any",
       "features": [
         "webgl"
       ]
@@ -797,6 +803,7 @@ LONG_STRING_CONST(
         }
       },
       "vendor_id": "0x15ad",
+      "multi_gpu_category": "any",
       "features": [
         "all"
       ]
@@ -1107,6 +1114,7 @@ LONG_STRING_CONST(
       },
       "vendor_id": "0x8086",
       "device_id": ["0x2a02"],
+      "multi_gpu_category": "any",
       "features": [
         "all"
       ]