Change GPUInfo to handle multiple GPUs.

content/gpu/gpu_info_collector_mac.mm

 // Copyright (c) 2011 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 "content/gpu/gpu_info_collector.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
@@ skipping 93 matching lines @@
     case 2:
       if (video_card_list[0].vendor_id == kIntelVendorId &&
           video_card_list[1].vendor_id != kIntelVendorId)
         found = 1;
       else if (video_card_list[0].vendor_id != kIntelVendorId &&
                video_card_list[1].vendor_id == kIntelVendorId)
         found = 0;
       break;
   }
   if (found < video_card_list.size()) {
-    gpu_info->vendor_id = video_card_list[found].vendor_id;
-    gpu_info->device_id = video_card_list[found].device_id;
+    gpu_info->gpu.vendor_id = video_card_list[found].vendor_id;
+    gpu_info->gpu.device_id = video_card_list[found].device_id;
     return true;
   }
   return false;
 }
 
 }  // namespace anonymous
 
 namespace gpu_info_collector {
 
 bool CollectGraphicsInfo(content::GPUInfo* gpu_info) {
@@ skipping 24 matching lines @@
   if (vendor_id_ref) {
     vendor_id = IntValueOfCFData((CFDataRef)vendor_id_ref);
     CFRelease(vendor_id_ref);
   }
   CFTypeRef device_id_ref = SearchPortForProperty(dsp_port, CFSTR("device-id"));
   if (device_id_ref) {
     device_id = IntValueOfCFData((CFDataRef)device_id_ref);
     CFRelease(device_id_ref);
   }
 
-  gpu_info->vendor_id = vendor_id;
-  gpu_info->device_id = device_id;
+  gpu_info->gpu.vendor_id = vendor_id;
+  gpu_info->gpu.device_id = device_id;
   return true;
 }
 
 bool CollectDriverInfoGL(content::GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   // Extract the OpenGL driver version string from the GL_VERSION string.
   // Mac OpenGL drivers have the driver version
   // at the end of the gl version string preceded by a dash.
   // Use some jiggery-pokery to turn that utf8 string into a std::wstring.
   std::string gl_version_string = gpu_info->gl_version_string;
   size_t pos = gl_version_string.find_last_of('-');
   if (pos == std::string::npos)
     return false;
   gpu_info->driver_version = gl_version_string.substr(pos + 1);
   return true;
 }
 
 }  // namespace gpu_info_collector