Revert 223397 "Enable GPU blacklist in tests."

> Enable GPU blacklist in tests.
> 
> Partial re-land of https://codereview.chromium.org/22198004/) -- Always enable FCM on Windows -- Part 1/3.
> 
> On top of fixing some of the issues there; only lands the part that enables the GPU blacklist in tests as the former CL is too hard to land all at once.
> 
> Also keeping --skip-gpu-data-loading around for now to be able to deal with failures caused in layout_tests by this on their own later (this needs to land ASAP and layout_tests don't need this ASAP).
> 
> Another CL will follow to always enable FCM on non-blacklisted Windows machines.
> 
> This part re-enables loading the blacklist in tests (and adds a content_browsertest to make sure that the configuration we expect to be testing is indeed the one we are testing -- this uncertainty is basically the only reason the blacklist was explicitly disabled before).
> 
> This CL also cleans up compositor_util.cc which was enforcing the blacklist twice.
> 
> The original plan was to do this only for Windows as Mac/Linux was causing trouble, but it turns out to be harder to do it only on Windows; so taking care of http://crbug.com/277242 in this CL too after all... 
> 
> BUG=233830, 267038, 190942, 277242
> TBR=jcivelli, piman 
> 
> Originally Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=219132 
> Then Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=219159
> 
> Then re-committed (part 1/3): https://src.chromium.org/viewvc/chrome?view=rev&revision=221114
> Reverted in: https://src.chromium.org/viewvc/chrome?view=rev&revision=221145
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=222105
> 
> Review URL: https://chromiumcodereview.appspot.com/23534006

TBR=gab@chromium.org

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

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

3 files changed, 4 insertions, 36 deletions

diff --git a/gpu/config/gpu_control_list.cc b/gpu/config/gpu_control_list.cc
index e106995..5eb09c4 100644
--- a/gpu/config/gpu_control_list.cc
+++ b/gpu/config/gpu_control_list.cc
@@ -10,7 +10,6 @@
 #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_util.h"
@@ -1037,12 +1036,6 @@ GpuControlList::GpuControlListEntry::StringToMultiGpuCategory(
   return kMultiGpuCategoryNone;
 }
 
-void GpuControlList::GpuControlListEntry::LogControlListMatch() const {
-  static const char kControlListMatchMessage[] =
-      "Control list match for rule #%u.";
-  LOG(INFO) << base::StringPrintf(kControlListMatchMessage, id_);
-}
-
 bool GpuControlList::GpuControlListEntry::Contains(
     OsType os_type, const std::string& os_version,
     const GPUInfo& gpu_info) const {
@@ -1199,8 +1192,7 @@ GpuControlList::GpuControlList()
     : max_entry_id_(0),
       contains_unknown_fields_(false),
       needs_more_info_(false),
-      supports_feature_type_all_(false),
-      control_list_logging_enabled_(false) {
+      supports_feature_type_all_(false) {
 }
 
 GpuControlList::~GpuControlList() {
@@ -1317,8 +1309,6 @@ std::set<int> GpuControlList::MakeDecision(
   for (size_t i = 0; i < entries_.size(); ++i) {
     if (entries_[i]->Contains(os, os_version, gpu_info)) {
       if (!entries_[i]->disabled()) {
-        if (control_list_logging_enabled_)
-          entries_[i]->LogControlListMatch();
         MergeFeatureSets(&possible_features, entries_[i]->features());
         if (!entries_[i]->NeedsMoreInfo(gpu_info))
           MergeFeatureSets(&features, entries_[i]->features());
diff --git a/gpu/config/gpu_control_list.h b/gpu/config/gpu_control_list.h
index b6d8d5c..62b66ec 100644
--- a/gpu/config/gpu_control_list.h
+++ b/gpu/config/gpu_control_list.h
@@ -96,9 +96,6 @@ class GPU_EXPORT GpuControlList {
   // Register whether "all" is recognized as all features.
   void set_supports_feature_type_all(bool supported);
 
-  // Enables logging of control list decisions.
-  void enable_control_list_logging() { control_list_logging_enabled_ = true; }
-
  private:
   friend class GpuControlListEntryTest;
   friend class MachineModelInfoTest;
@@ -295,9 +292,6 @@ class GPU_EXPORT GpuControlList {
         const FeatureMap& feature_map,
         bool supports_feature_type_all);
 
-    // Logs a control list match for this rule.
-    void LogControlListMatch() const;
-
     // Determines if a given os/gc/machine_model/driver is included in the
     // Entry set.
     bool Contains(OsType os_type, const std::string& os_version,
@@ -501,8 +495,6 @@ class GPU_EXPORT GpuControlList {
   // The features a GpuControlList recognizes and handles.
   FeatureMap feature_map_;
   bool supports_feature_type_all_;
-
-  bool control_list_logging_enabled_;
 };
 
 }  // namespace gpu
diff --git a/gpu/config/software_rendering_list_json.cc b/gpu/config/software_rendering_list_json.cc
index b576e47..15cc66d 100644
--- a/gpu/config/software_rendering_list_json.cc
+++ b/gpu/config/software_rendering_list_json.cc
@@ -67,7 +67,7 @@
 // "number" is used for all "op" values except "any". "number" and "number2"
 // are in the format of x, x.x, x.x.x, etc.
 // Only "driver_version" supports lexical style if the format is major.minor;
-// in that case, major is still numerical, but minor is lexical.
+// in that case, major is still numerical, but minor is lexical. 
 //
 // STRING includes "op" and "value".  "op" can be any of the following values:
 // "contains", "beginwith", "endwith", "=".  "value" is a string.
@@ -89,7 +89,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
 {
   "name": "software rendering list",
   // Please update the version number whenever you change this file.
-  "version": "6.10",
+  "version": "6.9",
   "entries": [
     {
       "id": 1,
@@ -1177,21 +1177,6 @@ LONG_STRING_CONST(
       "features": [
         "multisampling"
       ]
-    },
-    {
-      "id": 78,
-      "description": "Disable force compositing mode on all Windows versions prior to Vista.",
-      "cr_bugs": [273920],
-      "os": {
-        "type": "win",
-        "version": {
-          "op": "<",
-          "number": "6.0"
-        }
-      },
-      "features": [
-        "force_compositing_mode"
-      ]
     }
   ]
 }
@@ -1199,3 +1184,4 @@ LONG_STRING_CONST(
 );  // LONG_STRING_CONST macro
 
 }  // namespace gpu
+