Change GPUInfo to handle multiple GPUs.

chrome/browser/gpu_util.cc

Index: chrome/browser/gpu_util.cc
===================================================================
--- chrome/browser/gpu_util.cc	(revision 136164)
+++ chrome/browser/gpu_util.cc	(working copy)
@@ -336,9 +336,22 @@
       "Initialization time",
       base::Int64ToString(gpu_info.initialization_time.InMilliseconds())));
   basic_info->Append(NewDescriptionValuePair(
-      "Vendor Id", base::StringPrintf("0x%04x", gpu_info.vendor_id)));
+      "Vendor Id", base::StringPrintf("0x%04x", gpu_info.gpu.vendor_id)));
   basic_info->Append(NewDescriptionValuePair(
-      "Device Id", base::StringPrintf("0x%04x", gpu_info.device_id)));
+      "Device Id", base::StringPrintf("0x%04x", gpu_info.gpu.device_id)));
+  std::string secondary_gpus;
+  for (size_t i = 0; i < gpu_info.secondary_gpus.size(); ++i) {
+    if (!secondary_gpus.empty())
+      secondary_gpus += " ";
+    secondary_gpus += base::StringPrintf(
+        "[0x%04x,0x%04x]",
+        gpu_info.secondary_gpus[i].vendor_id,
+        gpu_info.secondary_gpus[i].device_id);
+  }
+  if (!secondary_gpus.empty()) {
+    basic_info->Append(NewDescriptionValuePair(
+        "Secondary GPUs", secondary_gpus));
+  }
   basic_info->Append(NewDescriptionValuePair(
       "Optimus", Value::CreateBooleanValue(gpu_info.optimus)));
   basic_info->Append(NewDescriptionValuePair(