Allow tracing categories to default to disabled.

base/debug/trace_event_impl.h

 // Copyright (c) 2012 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 BASE_DEBUG_TRACE_EVENT_IMPL_H_
 #define BASE_DEBUG_TRACE_EVENT_IMPL_H_
 
 #include <stack>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
+#include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "base/string_util.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "base/timer.h"
 
@@ skipping 202 matching lines @@
   // categories are distinguished from included categories by the prefix '-'.
   std::string ToString() const;
 
   // Determines whether category group would be enabled or
   // disabled by this category filter.
   bool IsCategoryGroupEnabled(const char* category_group) const;
 
   // Merges nested_filter with the current CategoryFilter
   void Merge(const CategoryFilter& nested_filter);
 
-  // Determines whether or not we have explicitly allowed category patterns.
-  bool HasIncludedPatterns() const;
-
   // Clears both included/excluded pattern lists. This would be equivalent to
   // creating a CategoryFilter with an empty string, through the constructor.
   // i.e: CategoryFilter("").
   //
   // When using an empty filter, all categories are considered included as we
   // are not excluding anything.
   void Clear();
 
+ private:
+  FRIEND_TEST_ALL_PREFIXES(TraceEventTestFixture, CategoryFilter);
+
   static bool IsEmptyOrContainsLeadingOrTrailingWhitespace(
       const std::string& str);
 
- private:
+  typedef std::vector<std::string> StringList;
+
   void Initialize(const std::string& filter_string);
-  void WriteString(std::string* out, bool included) const;
+  void WriteString(const StringList& values,
+                   std::string* out,
+                   bool included) const;
+  bool HasIncludedPatterns() const;
 
-  std::vector<std::string> included_;
-  std::vector<std::string> excluded_;
+  bool DoesCategoryGroupContainCategory(const char* category_group,
+                                        const char* category) const;
+
+  StringList included_;
+  StringList disabled_;
+  StringList excluded_;
 };
 
 class TraceSamplingThread;
 
 class BASE_EXPORT TraceLog {
  public:
   // Notification is a mask of one or more of the following events.
   enum Notification {
     // The trace buffer does not flush dynamically, so when it fills up,
     // subsequent trace events will be dropped. This callback is generated when
@@ skipping 275 matching lines @@
 
   CategoryFilter category_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(TraceLog);
 };
 
 }  // namespace debug
 }  // namespace base
 
 #endif  // BASE_DEBUG_TRACE_EVENT_IMPL_H_