Change GPUInfo to handle multiple GPUs.

content/gpu/gpu_main.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 <stdlib.h>
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 62 matching lines @@
 
   // Load and initialize the GL implementation and locate the GL entry points.
   content::GPUInfo gpu_info;
   if (gfx::GLSurface::InitializeOneOff()) {
     // Collect information about the GPU.
     if (!gpu_info_collector::CollectGraphicsInfo(&gpu_info)) {
       LOG(INFO) << "gpu_info_collector::CollectGraphicsInfo failed";
     }
 
 #if defined(OS_LINUX)
-    if (gpu_info.vendor_id == 0x10de &&  // NVIDIA
+    if (gpu_info.gpu.vendor_id == 0x10de &&  // NVIDIA
         gpu_info.driver_vendor == "NVIDIA") {
       base::ThreadRestrictions::AssertIOAllowed();
       if (access("/dev/nvidiactl", R_OK) != 0) {
         LOG(INFO) << "NVIDIA device file /dev/nvidiactl access denied";
         gpu_info.gpu_accessible = false;
         dead_on_arrival = true;
       }
     }
 #endif
 
@@ skipping 55 matching lines @@
   child_thread->Init(start_time);
 
   gpu_process.set_main_thread(child_thread);
 
   main_message_loop.Run();
 
   child_thread->StopWatchdog();
 
   return 0;
 }