Fix machine_model behaviors in gpu blacklist.

gpu/config/gpu_control_list.cc

 // Copyright (c) 2013 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 "gpu/config/gpu_control_list.h"
 
 #include "base/cpu.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 1121 matching lines @@
     return false;
   if (perf_gaming_info_.get() != NULL &&
       (gpu_info.performance_stats.gaming == 0.0 ||
        !perf_gaming_info_->Contains(gpu_info.performance_stats.gaming)))
     return false;
   if (perf_overall_info_.get() != NULL &&
       (gpu_info.performance_stats.overall == 0.0 ||
        !perf_overall_info_->Contains(gpu_info.performance_stats.overall)))
     return false;
   if (machine_model_info_.get() != NULL) {
+#if defined(OS_MACOSX)

[Ken Russell (switch to Gerrit), 2014/04/17 22:24:57]

Making this code conditionally compiled is really unfortunate. It means that not
all of the tests can be run on all platforms. It also means that the non-Mac
code violates the spec of machine_model in gpu_info.h. I think a better approach
would be to change the rules.

Currently, the "real" model identifier on Mac OS uses a comma as a separator:
for example, "MacBookPro10,1". Currently, lower-level code parses this and turns
it into a space-separated string. This conversion is basically only done for the
GPU blacklist.

I'd like to propose that we change the rules about machine_model in gpu_info.h
so that:

1) the name can contain spaces
2) the name and version are comma separated

and then change the code which reports the machine identifier on Mac OS so that
it reassembles the string to use a comma separator rather than a space
separator.

Then in gpu_info.h it should be very clearly documented that this is intended to
allow the model version on Mac OS to be parsed out and treated as the version in
the blacklist, while on Android devices like "Nexus 5", that's the entire
machine_model.

What do you think?

     std::vector<std::string> name_version;
     base::SplitString(gpu_info.machine_model, ' ', &name_version);
     if (name_version.size() == 2 &&
         !machine_model_info_->Contains(name_version[0], name_version[1]))
       return false;
+#else
+    if (!machine_model_info_->Contains(gpu_info.machine_model, std::string()))
+      return false;
+#endif
   }
   if (gpu_count_info_.get() != NULL &&
       !gpu_count_info_->Contains(gpu_info.secondary_gpus.size() + 1))
     return false;
   if (direct_rendering_info_.get() != NULL &&
       !direct_rendering_info_->Contains(gpu_info.direct_rendering))
     return false;
   if (cpu_brand_.get() != NULL) {
     base::CPU cpu_info;
     if (!cpu_brand_->Contains(cpu_info.cpu_brand()))
@@ skipping 282 matching lines @@
     const std::string& feature_name, int feature_id) {
   feature_map_[feature_name] = feature_id;
 }
 
 void GpuControlList::set_supports_feature_type_all(bool supported) {
   supports_feature_type_all_ = supported;
 }
 
 }  // namespace gpu