Change GPUInfo to handle multiple GPUs.

chrome/common/child_process_logging_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 "chrome/common/child_process_logging.h"
 
 #include <windows.h>
 
 #include "base/command_line.h"
 #include "base/string_util.h"
@@ skipping 137 matching lines @@
   if (!set_gpu_info) {
     HMODULE exe_module = GetModuleHandle(chrome::kBrowserProcessExecutableName);
     if (!exe_module)
       return;
     set_gpu_info = reinterpret_cast<MainSetGpuInfo>(
         GetProcAddress(exe_module, "SetGpuInfo"));
     if (!set_gpu_info)
       return;
   }
   (set_gpu_info)(
-      base::StringPrintf(L"0x%04x", gpu_info.vendor_id).c_str(),
-      base::StringPrintf(L"0x%04x", gpu_info.device_id).c_str(),
+      base::StringPrintf(L"0x%04x", gpu_info.gpu.vendor_id).c_str(),
+      base::StringPrintf(L"0x%04x", gpu_info.gpu.device_id).c_str(),
       UTF8ToUTF16(gpu_info.driver_version).c_str(),
       UTF8ToUTF16(gpu_info.pixel_shader_version).c_str(),
       UTF8ToUTF16(gpu_info.vertex_shader_version).c_str());
 }
 
 void SetPrinterInfo(const char* printer_info) {
   static MainSetPrinterInfo set_printer_info = NULL;
   // note: benign race condition on set_printer_info.
   if (!set_printer_info) {
     HMODULE exe_module = GetModuleHandle(chrome::kBrowserProcessExecutableName);
@@ skipping 46 matching lines @@
       return;
     set_number_of_views = reinterpret_cast<MainSetNumberOfViews>(
         GetProcAddress(exe_module, "SetNumberOfViews"));
     if (!set_number_of_views)
       return;
   }
   (set_number_of_views)(number_of_views);
 }
 
 }  // namespace child_process_logging