Category group support/Renamings.

chrome/test/base/tracing.h

Index: chrome/test/base/tracing.h
diff --git a/chrome/test/base/tracing.h b/chrome/test/base/tracing.h
index 15dffc7bf65ef1d82537a0eec1a3165a34575541..0dd21b881ed42663f1ea6ae22b195b81abc9cda3 100644
--- a/chrome/test/base/tracing.h
+++ b/chrome/test/base/tracing.h
@@ -13,24 +13,25 @@
 namespace tracing {
 
 // Called from UI thread.
-// Begin tracing specified categories on the browser.
-// |categories| is a comma-delimited list of category wildcards. A category can
-// have an optional '-' prefix to make it an excluded category. Either all
-// categories must be included or all must be excluded.
+// Begin tracing specified category_patterns on the browser.
+// |category_patterns| is a comma-delimited list of category wildcards.
+// A category pattern can have an optional '-' prefix to make  categories with
+// matching categorys excluded. Either all category_patterns must be included
+// or all must be excluded.
 //
 // Example: BeginTracing("test_MyTest*");
 // Example: BeginTracing("test_MyTest*,test_OtherStuff");
 // Example: BeginTracing("-excluded_category1,-excluded_category2");
 //
 // See base/debug/trace_event.h for documentation of included and excluded
-// categories.
-bool BeginTracing(const std::string& categories) WARN_UNUSED_RESULT;
+// category_patterns.
+bool BeginTracing(const std::string& category_patterns) WARN_UNUSED_RESULT;
 
 // Called from UI thread.
 // Specify a watch event in order to use the WaitForWatchEvent function.
 // After |num_occurrences| of the given event have been seen on a particular
 // process, WaitForWatchEvent will return.
-bool BeginTracingWithWatch(const std::string& categories,
+bool BeginTracingWithWatch(const std::string& category_patterns,
                            const std::string& category_name,
                            const std::string& event_name,
                            int num_occurrences) WARN_UNUSED_RESULT;