Merge part of r75473....

chrome/browser/gpu_blacklist.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_GPU_BLACKLIST_H_
 #define CHROME_BROWSER_GPU_BLACKLIST_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 136 matching lines @@
     std::string value_;
   };
 
   class GpuBlacklistEntry {
    public:
     // Constructs GpuBlacklistEntry from DictionaryValue loaded from json.
     static GpuBlacklistEntry* GetGpuBlacklistEntryFromValue(
         DictionaryValue* value);
 
     // Determines if a given os/gc/driver is included in the Entry set.
-    bool Contains(OsType os_type, const Version& os_version,
-                  uint32 vendor_id, uint32 device_id,
-                  const std::string& driver_vendor,
-                  const Version& driver_version,
-                  const std::string& gl_renderer) const;
+    bool Contains(OsType os_type,
+                  const Version& os_version,
+                  const GPUInfo& gpu_info) const;
 
     // Returns the OsType.
     OsType GetOsType() const;
 
     // Returns the entry's unique id.  0 is reserved.
     uint32 id() const;
 
     // Returns the GpuFeatureFlags.
     GpuFeatureFlags GetGpuFeatureFlags() const;
 
@@ skipping 49 matching lines @@
   // called and is used later by GetGpuFeatureFlagEntries().
   std::vector<GpuBlacklistEntry*> active_entries_;
 
   uint32 max_entry_id_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuBlacklist);
 };
 
 #endif  // CHROME_BROWSER_GPU_BLACKLIST_H_