Change GPUInfo to handle multiple GPUs.

content/test/gpu/gpu_test_config.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/test/gpu/gpu_test_config.h"
 
 #include "base/logging.h"
 #include "base/sys_info.h"
 #include "content/gpu/gpu_info_collector.h"
 #include "content/public/common/gpu_info.h"
@@ skipping 110 matching lines @@
 
 GPUTestBotConfig::~GPUTestBotConfig() {
 }
 
 void GPUTestBotConfig::AddGPUVendor(uint32 gpu_vendor) {
   DCHECK_EQ(0u, GPUTestConfig::gpu_vendor().size());
   GPUTestConfig::AddGPUVendor(gpu_vendor);
 }
 
 bool GPUTestBotConfig::SetGPUInfo(const content::GPUInfo& gpu_info) {
-  if (gpu_info.device_id == 0 || gpu_info.vendor_id == 0)
+  if (gpu_info.gpu.device_id == 0 || gpu_info.gpu.vendor_id == 0)
     return false;
   ClearGPUVendor();
-  AddGPUVendor(gpu_info.vendor_id);
-  set_gpu_device_id(gpu_info.device_id);
+  AddGPUVendor(gpu_info.gpu.vendor_id);
+  set_gpu_device_id(gpu_info.gpu.device_id);
   return true;
 }
 
 bool GPUTestBotConfig::IsValid() const {
   switch (os()) {
     case kOsWinXP:
     case kOsWinVista:
     case kOsWin7:
     case kOsMacLeopard:
     case kOsMacSnowLeopard:
@@ skipping 56 matching lines @@
   if (os() == kOsUnknown)
     rt = false;
 #if defined(NDEBUG)
   set_build_type(kBuildTypeRelease);
 #else
   set_build_type(kBuildTypeDebug);
 #endif
   return rt;
 }