Change GPUInfo to handle multiple GPUs.

content/test/gpu/gpu_test_config_unittest.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 "content/public/common/gpu_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class GPUTestConfigTest : public testing::Test {
  public:
@@ skipping 10 matching lines @@
 TEST_F(GPUTestConfigTest, EmptyValues) {
   GPUTestConfig config;
   EXPECT_EQ(GPUTestConfig::kOsUnknown, config.os());
   EXPECT_EQ(0u, config.gpu_vendor().size());
   EXPECT_EQ(0u, config.gpu_device_id());
   EXPECT_EQ(GPUTestConfig::kBuildTypeUnknown, config.build_type());
 }
 
 TEST_F(GPUTestConfigTest, SetGPUInfo) {
   content::GPUInfo gpu_info;
-  gpu_info.vendor_id = 0x10de;
-  gpu_info.device_id = 0x0640;
+  gpu_info.gpu.vendor_id = 0x10de;
+  gpu_info.gpu.device_id = 0x0640;
   GPUTestBotConfig config;
   EXPECT_TRUE(config.SetGPUInfo(gpu_info));
   EXPECT_EQ(1u, config.gpu_vendor().size());
-  EXPECT_EQ(gpu_info.vendor_id, config.gpu_vendor()[0]);
-  EXPECT_EQ(gpu_info.device_id, config.gpu_device_id());
+  EXPECT_EQ(gpu_info.gpu.vendor_id, config.gpu_vendor()[0]);
+  EXPECT_EQ(gpu_info.gpu.device_id, config.gpu_device_id());
 
-  gpu_info.vendor_id = 0x8086;
-  gpu_info.device_id = 0x0046;
+  gpu_info.gpu.vendor_id = 0x8086;
+  gpu_info.gpu.device_id = 0x0046;
   EXPECT_TRUE(config.SetGPUInfo(gpu_info));
   EXPECT_EQ(1u, config.gpu_vendor().size());
-  EXPECT_EQ(gpu_info.vendor_id, config.gpu_vendor()[0]);
-  EXPECT_EQ(gpu_info.device_id, config.gpu_device_id());
+  EXPECT_EQ(gpu_info.gpu.vendor_id, config.gpu_vendor()[0]);
+  EXPECT_EQ(gpu_info.gpu.device_id, config.gpu_device_id());
 }
 
 TEST_F(GPUTestConfigTest, IsValid) {
   {
     GPUTestConfig config;
     config.set_gpu_device_id(0x0640);
     EXPECT_FALSE(config.IsValid());
     config.AddGPUVendor(0x10de);
     EXPECT_TRUE(config.IsValid());
   }
@@ skipping 150 matching lines @@
     GPUTestConfig config2;
     config2.AddGPUVendor(0x10de);
     EXPECT_TRUE(config.OverlapsWith(config2));
     EXPECT_TRUE(config2.OverlapsWith(config));
   }
 }
 
 TEST_F(GPUTestConfigTest, LoadCurrentConfig) {
   GPUTestBotConfig config;
   content::GPUInfo gpu_info;
-  gpu_info.vendor_id = 0x10de;
-  gpu_info.device_id = 0x0640;
+  gpu_info.gpu.vendor_id = 0x10de;
+  gpu_info.gpu.device_id = 0x0640;
   EXPECT_TRUE(config.LoadCurrentConfig(&gpu_info));
   EXPECT_TRUE(config.IsValid());
 }
 

[Ken Russell (switch to Gerrit), 2012/05/10 01:11:09]

Are any new unit tests needed or possible?

[Zhenyao Mo, 2012/05/10 21:55:32]

Not really.  Test bot config only needs to deal with primary GPU, and the
behavior of that is not changing with this CL and is already tested.