Change GPUInfo to handle multiple GPUs.

chrome/common/child_process_logging_posix.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/common/child_process_logging.h"
 
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
@@ skipping 71 matching lines @@
   for (int i = 0;
        i < kMaxReportedActiveExtensions && iter != extension_ids.end();
        ++i, ++iter) {
     extension_str += *iter;
   }
   strncpy(g_extension_ids, extension_str.c_str(), kMaxExtensionSize - 1);
   g_extension_ids[kMaxExtensionSize - 1] = '\0';
 }
 
 void SetGpuInfo(const content::GPUInfo& gpu_info) {
-  snprintf(g_gpu_vendor_id, kGpuStringSize, "0x%04x", gpu_info.vendor_id);
-  snprintf(g_gpu_device_id, kGpuStringSize, "0x%04x", gpu_info.device_id);
+  snprintf(g_gpu_vendor_id, kGpuStringSize, "0x%04x", gpu_info.gpu.vendor_id);
+  snprintf(g_gpu_device_id, kGpuStringSize, "0x%04x", gpu_info.gpu.device_id);
   strncpy(g_gpu_driver_ver,
           gpu_info.driver_version.c_str(),
           kGpuStringSize - 1);
   g_gpu_driver_ver[kGpuStringSize - 1] = '\0';
   strncpy(g_gpu_ps_ver,
           gpu_info.pixel_shader_version.c_str(),
           kGpuStringSize - 1);
   g_gpu_ps_ver[kGpuStringSize - 1] = '\0';
   strncpy(g_gpu_vs_ver,
           gpu_info.vertex_shader_version.c_str(),
@@ skipping 42 matching lines @@
 void SetExperimentList(const std::vector<string16>& state) {
   // TODO(mad): Implement this.
 }
 
 void SetChannel(const std::string& channel) {
   strncpy(g_channel, channel.c_str(), kChannelSize - 1);
   g_channel[kChannelSize - 1] = '\0';
 }
 
 }  // namespace child_process_logging