Change GPUInfo to handle multiple GPUs.

chrome/browser/gpu_blacklist_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 <vector>
 
 #include "base/base_paths.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 15 matching lines @@
   const content::GPUInfo& gpu_info() const {
     return gpu_info_;
   }
 
   GpuBlacklist* Create() {
     return new GpuBlacklist();
   }
 
  protected:
   void SetUp() {
-    gpu_info_.vendor_id = 0x10de;
-    gpu_info_.device_id = 0x0640;
+    gpu_info_.gpu.vendor_id = 0x10de;
+    gpu_info_.gpu.device_id = 0x0640;
     gpu_info_.driver_vendor = "NVIDIA";
     gpu_info_.driver_version = "1.6.18";
     gpu_info_.driver_date = "7-14-2009";
     gpu_info_.gl_vendor = "NVIDIA Corporation";
     gpu_info_.gl_renderer = "NVIDIA GeForce GT 120 OpenGL Engine";
     gpu_info_.performance_stats.graphics = 5.0;
     gpu_info_.performance_stats.gaming = 5.0;
     gpu_info_.performance_stats.overall = 5.0;
   }
 
@@ skipping 700 matching lines @@
   std::vector<uint32> flag_entries;
   bool disabled = false;
   blacklist->GetGpuFeatureTypeEntries(
       content::GPU_FEATURE_TYPE_ALL, flag_entries, disabled);
   EXPECT_EQ(flag_entries.size(), 0u);
   disabled = true;
   blacklist->GetGpuFeatureTypeEntries(
       content::GPU_FEATURE_TYPE_ALL, flag_entries, disabled);
   EXPECT_EQ(flag_entries.size(), 1u);
 }