Revert 228401 "Enable GPU control lists in tests."

trunk/src/gpu/config/gpu_control_list.h

 // 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.
 
 #ifndef GPU_CONFIG_GPU_CONTROL_LIST_H_
 #define GPU_CONFIG_GPU_CONTROL_LIST_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 75 matching lines @@
   bool needs_more_info() const { return needs_more_info_; }
 
   // Returns the number of entries.  This is only for tests.
   size_t num_entries() const;
 
   // Register a feature to FeatureMap - used to construct a GpuControlList.
   void AddSupportedFeature(const std::string& feature_name, int feature_id);
   // 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(
-      const std::string& control_list_logging_name) {
-    control_list_logging_enabled_ = true;
-    control_list_logging_name_ = control_list_logging_name;
-  }
-
  private:
   friend class GpuControlListEntryTest;
   friend class MachineModelInfoTest;
   friend class NumberInfoTest;
   friend class OsInfoTest;
   friend class StringInfoTest;
   friend class VersionInfoTest;
 
   enum BrowserVersionSupport {
     kSupported,
@@ skipping 176 matching lines @@
   class GPU_EXPORT GpuControlListEntry
       : public base::RefCounted<GpuControlListEntry> {
    public:
     // Constructs GpuControlListEntry from DictionaryValue loaded from json.
     // Top-level entry must have an id number.  Others are exceptions.
     static ScopedGpuControlListEntry GetEntryFromValue(
         const base::DictionaryValue* value, bool top_level,
         const FeatureMap& feature_map,
         bool supports_feature_type_all);
 
-    // Logs a control list match for this rule in the list identified by
-    // |control_list_logging_name|.
-    void LogControlListMatch(
-        const std::string& control_list_logging_name) 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,
                   const GPUInfo& gpu_info) const;
 
     // Determines whether we needs more gpu info to make the blacklisting
     // decision.  It should only be checked if Contains() returns true.
     bool NeedsMoreInfo(const GPUInfo& gpu_info) const;
 
     // Returns the OsType.
@@ skipping 170 matching lines @@
   // used later by GetDecisionEntries().
   std::vector<ScopedGpuControlListEntry> active_entries_;
 
   uint32 max_entry_id_;
 
   bool needs_more_info_;
 
   // The features a GpuControlList recognizes and handles.
   FeatureMap feature_map_;
   bool supports_feature_type_all_;
-
-  bool control_list_logging_enabled_;
-  std::string control_list_logging_name_;
 };
 
 }  // namespace gpu
 
 #endif  // GPU_CONFIG_GPU_CONTROL_LIST_H_