Change GPUInfo to handle multiple GPUs.

chrome/browser/gpu_util.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/gpu_util.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 318 matching lines @@
   return status;
 }
 
 DictionaryValue* GpuInfoAsDictionaryValue() {
   content::GPUInfo gpu_info = GpuDataManager::GetInstance()->GetGPUInfo();
   ListValue* basic_info = new ListValue();
   basic_info->Append(NewDescriptionValuePair(
       "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(
       "AMD switchable", Value::CreateBooleanValue(gpu_info.amd_switchable)));
   basic_info->Append(NewDescriptionValuePair("Driver vendor",
                                              gpu_info.driver_vendor));
   basic_info->Append(NewDescriptionValuePair("Driver version",
                                              gpu_info.driver_version));
   basic_info->Append(NewDescriptionValuePair("Driver date",
                                              gpu_info.driver_date));
@@ skipping 117 matching lines @@
         kGpuBlacklistFeatureHistogramNamesWin[i],
         1, kNumWinSubVersions * kGpuFeatureNumStatus,
         kNumWinSubVersions * kGpuFeatureNumStatus + 1,
         base::Histogram::kUmaTargetedHistogramFlag);
     histogram_pointer->Add(GetGpuBlacklistHistogramValueWin(value));
 #endif
   }
 }
 
 }  // namespace gpu_util;