Trace category groups and category filter.

content/browser/trace_controller_impl.h

Index: content/browser/trace_controller_impl.h
diff --git a/content/browser/trace_controller_impl.h b/content/browser/trace_controller_impl.h
index 2144b54c504b99b0b048380fab9aa627184511e3..1c9cf6d9c02a67338485aecc35b7395c3ca380d2 100644
--- a/content/browser/trace_controller_impl.h
+++ b/content/browser/trace_controller_impl.h
@@ -31,18 +31,21 @@ class TraceControllerImpl : public TraceController {
   // once the categories are retrieved from child processes.
   bool GetKnownCategoriesAsync(TraceSubscriber* subscriber);
 
-  // Same as above, but specifies which categories to trace.
-  // If both included_categories and excluded_categories are empty,
-  //   all categories are traced.
-  // Else if included_categories is non-empty, only those are traced.
-  // Else if excluded_categories is non-empty, everything but those are traced.
+  // Same as above, but specifies which categories to trace using tag
+  // patterns.
+  // If both included_tag_patterns and excluded_tag_patterns are empty, all
+  // categories are traced.
+  // Else if included_tag_patterns is non-empty, only those categories that
+  // contain a matching tag, are traced.
+  // Else if excluded_tag_patterns is non-empty, everything but those
+  // categories that have a matching tag are traced.
   bool BeginTracing(TraceSubscriber* subscriber,
-                    const std::vector<std::string>& included_categories,
-                    const std::vector<std::string>& excluded_categories);
+                    const std::vector<std::string>& included_tag_patterns,
+                    const std::vector<std::string>& excluded_tag_patterns);
 
   // TraceController implementation:
   virtual bool BeginTracing(TraceSubscriber* subscriber,
-                            const std::string& categories) OVERRIDE;
+                            const std::string& tag_patterns) OVERRIDE;
   virtual  bool EndTracingAsync(TraceSubscriber* subscriber) OVERRIDE;
   virtual bool GetTraceBufferPercentFullAsync(
       TraceSubscriber* subscriber) OVERRIDE;
@@ -102,8 +105,8 @@ class TraceControllerImpl : public TraceController {
   bool is_tracing_;
   bool is_get_categories_;
   std::set<std::string> known_categories_;
-  std::vector<std::string> included_categories_;
-  std::vector<std::string> excluded_categories_;
+  std::vector<std::string> included_tag_patterns_;
+  std::vector<std::string> excluded_tag_patterns_;
   std::string watch_category_;
   std::string watch_name_;