Change GPUInfo to handle multiple GPUs.

chrome/browser/gpu_blacklist.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/browser/gpu_blacklist.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
@@ skipping 647 matching lines @@
     ScopedGpuBlacklistEntry exception) {
   exceptions_.push_back(exception);
 }
 
 bool GpuBlacklist::GpuBlacklistEntry::Contains(
     OsType os_type, const Version& os_version,
     const content::GPUInfo& gpu_info) const {
   DCHECK(os_type != kOsAny);
   if (os_info_.get() != NULL && !os_info_->Contains(os_type, os_version))
     return false;
-  if (vendor_id_ != 0 && vendor_id_ != gpu_info.vendor_id)
+  if (vendor_id_ != 0 && vendor_id_ != gpu_info.gpu.vendor_id)
     return false;
   if (device_id_list_.size() > 0) {
     bool found = false;
     for (size_t i = 0; i < device_id_list_.size(); ++i) {
-      if (device_id_list_[i] == gpu_info.device_id) {
+      if (device_id_list_[i] == gpu_info.gpu.device_id) {
         found = true;
         break;
       }
     }
     if (!found)
       return false;
   }
   if (driver_vendor_info_.get() != NULL &&
       !driver_vendor_info_->Contains(gpu_info.driver_vendor))
     return false;
@@ skipping 313 matching lines @@
     return kGT;
   if (op == ">=")
     return kGE;
   if (op == "any")
     return kAny;
   if (op == "between")
     return kBetween;
   return kUnknown;
 }