Make gpu black list work again on Linux

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 <stddef.h>
 #include <stdint.h>
 
+#include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "gpu/config/gpu_info.h"
+#include "gpu/config/gpu_switches.h"
 #include "gpu/config/gpu_util.h"
 #include "third_party/re2/src/re2/re2.h"
 
 namespace gpu {
 namespace {
 
 // Break a version string into segments.  Return true if each segment is
 // a valid number, and not all segment is 0.
 bool ProcessVersionString(const std::string& version_string,
                           char splitter,
@@ skipping 1395 matching lines @@
   std::set<int> permanent_features;
   // Has all features absent from "features" set that could potentially be
   // included later with more information.
   std::set<int> potential_features;
 
   if (os == kOsAny)
     os = GetOsType();
   if (os_version.empty())
     os_version = base::SysInfo::OperatingSystemVersion();
 
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();

[Zhenyao Mo, 2016/01/29 22:40:35]

I disagree with this method of hacking all over the places for testing purpose,
including this and the ones in GpuInfoCollector.

Instead, you should only process these test commandline switches in
gpu_data_manager_impl_private.cc, and rewrite GPUInfo if there are testing
values, and use the testing os_version for MakeDecisions() call. That's a much
less intrusive and easier to maintain way.

+  if (command_line->HasSwitch(switches::kGpuTestingOsVersion))
+    os_version =
+        command_line->GetSwitchValueASCII(switches::kGpuTestingOsVersion);
+
   for (size_t i = 0; i < entries_.size(); ++i) {
     ScopedGpuControlListEntry entry = entries_[i];
     if (entry->Contains(os, os_version, gpu_info)) {
       bool needs_more_info_main = entry->NeedsMoreInfo(gpu_info, false);
       bool needs_more_info_exception = entry->NeedsMoreInfo(gpu_info, true);
 
       if (!entry->disabled()) {
         if (control_list_logging_enabled_)
           entry->LogControlListMatch(control_list_logging_name_);
         // Only look at main entry info when deciding what to add to "features"
@@ skipping 139 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