Change GPUInfo to handle multiple GPUs.

content/gpu/gpu_info_collector_win.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 "content/gpu/gpu_info_collector.h"
 
 #include <windows.h>
 #include <d3d9.h>
 #include <setupapi.h>
 #include <winsatcominterfacei.h>
@@ skipping 201 matching lines @@
       break;
     }
   }
 
   if (id.length() > 20) {
     int vendor_id = 0, device_id = 0;
     std::wstring vendor_id_string = id.substr(8, 4);
     std::wstring device_id_string = id.substr(17, 4);
     base::HexStringToInt(WideToASCII(vendor_id_string), &vendor_id);
     base::HexStringToInt(WideToASCII(device_id_string), &device_id);
-    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;
     // TODO(zmo): we only need to call CollectDriverInfoD3D() if we use ANGLE.
     return CollectDriverInfoD3D(id, gpu_info);
   }
   return false;
 }
 
 bool CollectDriverInfoD3D(const std::wstring& device_id,
                           content::GPUInfo* gpu_info) {
   // create device info for the display device
   HDEVINFO device_info = SetupDiGetClassDevsW(
@@ skipping 77 matching lines @@
 
   size_t pos = gl_version_string.find_last_not_of("0123456789.");
   if (pos != std::string::npos && pos < gl_version_string.length() - 1) {
     gpu_info->driver_version = gl_version_string.substr(pos + 1);
     return true;
   }
   return false;
 }
 
 }  // namespace gpu_info_collector