Revert 227977 "Enable GPU control lists in tests."

trunk/src/gpu/config/gpu_control_list.cc

Index: trunk/src/gpu/config/gpu_control_list.cc
===================================================================
--- trunk/src/gpu/config/gpu_control_list.cc	(revision 228013)
+++ trunk/src/gpu/config/gpu_control_list.cc	(working copy)
@@ -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"
@@ -1031,14 +1030,6 @@
   return kMultiGpuCategoryNone;
 }
 
-void GpuControlList::GpuControlListEntry::LogControlListMatch(
-    const std::string& control_list_logging_name) const {
-  static const char kControlListMatchMessage[] =
-      "Control list match for rule #%u in %s.";
-  LOG(INFO) << base::StringPrintf(kControlListMatchMessage, id_,
-                                  control_list_logging_name.c_str());
-}
-
 bool GpuControlList::GpuControlListEntry::Contains(
     OsType os_type, const std::string& os_version,
     const GPUInfo& gpu_info) const {
@@ -1194,8 +1185,7 @@
 GpuControlList::GpuControlList()
     : max_entry_id_(0),
       needs_more_info_(false),
-      supports_feature_type_all_(false),
-      control_list_logging_enabled_(false) {
+      supports_feature_type_all_(false) {
 }
 
 GpuControlList::~GpuControlList() {
@@ -1302,8 +1292,6 @@
   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(control_list_logging_name_);
         MergeFeatureSets(&possible_features, entries_[i]->features());
         if (!entries_[i]->NeedsMoreInfo(gpu_info))
           MergeFeatureSets(&features, entries_[i]->features());