Fix machine_model behaviors in gpu blacklist.

We made the assumption that GPUInfo.machine_model is (name, version).

This is true for mac, where this machine_model was originally designed for.
Now we also use it on Android. However, the whole machine_model should just
be retreated as one name string.

Now on Android Nexus, we have "Nexus 5", "Nexus 7", so they are processed
like on Mac, which is incorrect.

I believe a few android entries in the software_rendering_list_json.cc
are not active right now due to the (name, version).

BUG=364743
TEST=gpu_unittests
R=kbr@chromium.org, tsepez@chromium.org, vrk@chromium.org
TBR=pfeldman@chromium.org

Review URL: https://codereview.chromium.org/241793002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265062 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 26 deletions

diff --git a/gpu/config/gpu_control_list.h b/gpu/config/gpu_control_list.h
index 34d112b..c3f1cf6 100644
--- a/gpu/config/gpu_control_list.h
+++ b/gpu/config/gpu_control_list.h
@@ -265,26 +265,6 @@ class GPU_EXPORT GpuControlList {
     bool value_;
   };
 
-  class GPU_EXPORT MachineModelInfo {
-   public:
-    MachineModelInfo(const std::string& name_op,
-                     const std::string& name_value,
-                     const std::string& version_op,
-                     const std::string& version_string,
-                     const std::string& version_string2);
-    ~MachineModelInfo();
-
-    // Determines if a given name/version is included in the MachineModelInfo.
-    bool Contains(const std::string& name, const std::string& version) const;
-
-    // Determines if the MachineModelInfo contains valid information.
-    bool IsValid() const;
-
-   private:
-    scoped_ptr<StringInfo> name_info_;
-    scoped_ptr<VersionInfo> version_info_;
-  };
-
   class GpuControlListEntry;
   typedef scoped_refptr<GpuControlListEntry> ScopedGpuControlListEntry;
 
@@ -419,11 +399,11 @@ class GPU_EXPORT GpuControlList {
                             const std::string& float_string,
                             const std::string& float_string2);
 
-    bool SetMachineModelInfo(const std::string& name_op,
-                             const std::string& name_value,
-                             const std::string& version_op,
-                             const std::string& version_string,
-                             const std::string& version_string2);
+    bool AddMachineModelName(const std::string& model_name);
+
+    bool SetMachineModelVersionInfo(const std::string& version_op,
+                                    const std::string& version_string,
+                                    const std::string& version_string2);
 
     bool SetGpuCountInfo(const std::string& op,
                          const std::string& int_string,
@@ -469,7 +449,8 @@ class GPU_EXPORT GpuControlList {
     scoped_ptr<FloatInfo> perf_graphics_info_;
     scoped_ptr<FloatInfo> perf_gaming_info_;
     scoped_ptr<FloatInfo> perf_overall_info_;
-    scoped_ptr<MachineModelInfo> machine_model_info_;
+    std::vector<std::string> machine_model_name_list_;
+    scoped_ptr<VersionInfo> machine_model_version_info_;
     scoped_ptr<IntInfo> gpu_count_info_;
     scoped_ptr<BoolInfo> direct_rendering_info_;
     std::set<int> features_;