Enhance GPU blacklist so we can also blacklist GPUs other than the primary one.

chrome/browser/gpu_blacklist.h

 // 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.
 
 #ifndef CHROME_BROWSER_GPU_BLACKLIST_H_
 #define CHROME_BROWSER_GPU_BLACKLIST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 254 matching lines @@
 
    private:
     friend class base::RefCounted<GpuBlacklistEntry>;
 
     enum MultiGpuStyle {
       kMultiGpuStyleOptimus,
       kMultiGpuStyleAMDSwitchable,
       kMultiGpuStyleNone
     };
 
+    enum MultiGpuCategory {
+      kMultiGpuCategoryPrimary,
+      kMultiGpuCategorySecondary,
+      kMultiGpuCategoryAny,
+      kMultiGpuCategoryNone
+    };
+
     GpuBlacklistEntry();
     ~GpuBlacklistEntry() { }
 
     bool SetId(uint32 id);
 
     void SetDisabled(bool disabled);
 
     bool SetOsInfo(const std::string& os,
                    const std::string& version_op,
                    const std::string& version_string,
                    const std::string& version_string2);
 
     bool SetVendorId(const std::string& vendor_id_string);
 
     bool AddDeviceId(const std::string& device_id_string);
 
     bool SetMultiGpuStyle(const std::string& multi_gpu_style_string);
 
+    bool SetMultiGpuCategory(const std::string& multi_gpu_category_string);
+
     bool SetDriverVendorInfo(const std::string& vendor_op,
                              const std::string& vendor_value);
 
     bool SetDriverVersionInfo(const std::string& version_op,
                               const std::string& version_style,
                               const std::string& version_string,
                               const std::string& version_string2);
 
     bool SetDriverDateInfo(const std::string& date_op,
                            const std::string& date_string,
@@ skipping 17 matching lines @@
                             const std::string& float_string,
                             const std::string& float_string2);
 
     bool SetBlacklistedFeatures(
         const std::vector<std::string>& blacklisted_features);
 
     void AddException(ScopedGpuBlacklistEntry exception);
 
     static MultiGpuStyle StringToMultiGpuStyle(const std::string& style);
 
+    static MultiGpuCategory StringToMultiGpuCategory(
+        const std::string& category);
+
     uint32 id_;
     bool disabled_;
     std::string description_;
     std::vector<int> cr_bugs_;
     std::vector<int> webkit_bugs_;
     scoped_ptr<OsInfo> os_info_;
     uint32 vendor_id_;
     std::vector<uint32> device_id_list_;
     MultiGpuStyle multi_gpu_style_;
+    MultiGpuCategory multi_gpu_category_;
     scoped_ptr<StringInfo> driver_vendor_info_;
     scoped_ptr<VersionInfo> driver_version_info_;
     scoped_ptr<VersionInfo> driver_date_info_;
     scoped_ptr<StringInfo> gl_vendor_info_;
     scoped_ptr<StringInfo> gl_renderer_info_;
     scoped_ptr<FloatInfo> perf_graphics_info_;
     scoped_ptr<FloatInfo> perf_gaming_info_;
     scoped_ptr<FloatInfo> perf_overall_info_;
     content::GpuFeatureType feature_type_;
     std::vector<ScopedGpuBlacklistEntry> exceptions_;
@@ skipping 43 matching lines @@
   std::vector<ScopedGpuBlacklistEntry> active_entries_;
 
   uint32 max_entry_id_;
 
   bool contains_unknown_fields_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuBlacklist);
 };
 
 #endif  // CHROME_BROWSER_GPU_BLACKLIST_H_