Category group support/Renamings.

content/public/browser/trace_controller.h

Index: content/public/browser/trace_controller.h
diff --git a/content/public/browser/trace_controller.h b/content/public/browser/trace_controller.h
index 211f7f54a521eb90615048f7f3b69587f51f9064..a9a29459f1131d7b6f7ef81015a2ca4caabc4f38 100644
--- a/content/public/browser/trace_controller.h
+++ b/content/public/browser/trace_controller.h
@@ -31,10 +31,11 @@ class TraceController {
   //   or if another subscriber is tracing,
   //   BeginTracing will return false meaning it failed.
   //
-  // |categories| is a comma-delimited list of category wildcards.
-  // A category can have an optional '-' prefix to make it an excluded category.
+  // |category_patterns| is a comma-delimited list of category wildcards.
+  // A category pattern can have an optional '-' prefix to exclude category
+  // groups that contain a matching category.
   // All the same rules apply above, so for example, having both included and
-  // excluded categories in the same list would not be supported.
+  // excluded category patterns in the same list would not be supported.
   //
   // |mode| is the tracing mode being used.
   //
@@ -42,7 +43,7 @@ class TraceController {
   // Example: BeginTracing("test_MyTest*,test_OtherStuff");
   // Example: BeginTracing("-excluded_category1,-excluded_category2");
   virtual bool BeginTracing(TraceSubscriber* subscriber,
-                            const std::string& categories,
+                            const std::string& category_patterns,
                             base::debug::TraceLog::Options options) = 0;
 
   // Called by browser process to stop tracing events on all processes.