Change GPUInfo to handle multiple GPUs.

chrome/common/child_process_logging_mac.mm

 // 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"
 
 #import <Foundation/Foundation.h>
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
@@ skipping 124 matching lines @@
 void SetGpuKeyValue(const char* param_name, const std::string& value_str,
                     SetCrashKeyValueFuncPtr set_key_func) {
   NSString *key = [NSString stringWithUTF8String:param_name];
   NSString *value = [NSString stringWithUTF8String:value_str.c_str()];
   set_key_func(key, value);
 }
 
 void SetGpuInfoImpl(const content::GPUInfo& gpu_info,
                     SetCrashKeyValueFuncPtr set_key_func) {
   SetGpuKeyValue(kGPUVendorIdParamName,
-                 base::StringPrintf("0x%04x", gpu_info.vendor_id),
+                 base::StringPrintf("0x%04x", gpu_info.gpu.vendor_id),
                  set_key_func);
   SetGpuKeyValue(kGPUDeviceIdParamName,
-                 base::StringPrintf("0x%04x", gpu_info.device_id),
+                 base::StringPrintf("0x%04x", gpu_info.gpu.device_id),
                  set_key_func);
   SetGpuKeyValue(kGPUDriverVersionParamName,
                  gpu_info.driver_version,
                  set_key_func);
   SetGpuKeyValue(kGPUPixelShaderVersionParamName,
                  gpu_info.pixel_shader_version,
                  set_key_func);
   SetGpuKeyValue(kGPUVertexShaderVersionParamName,
                  gpu_info.vertex_shader_version,
                  set_key_func);
@@ skipping 66 matching lines @@
 }
 
 void SetChannel(const std::string& channel) {
   // This should match the corresponding string in breakpad_win.cc.
   NSString* const kChannelKey = @"channel";
 
   SetCrashKeyValue(kChannelKey, base::SysUTF8ToNSString(channel));
 }
 
 }  // namespace child_process_logging