Trace category groups and category filter.

content/browser/trace_controller_impl.cc

Index: content/browser/trace_controller_impl.cc
diff --git a/content/browser/trace_controller_impl.cc b/content/browser/trace_controller_impl.cc
index 01542e320481368c9cb737157f722609acaac957..eb229936fc8df267a43293169cdc7fda7a5c0ac5 100644
--- a/content/browser/trace_controller_impl.cc
+++ b/content/browser/trace_controller_impl.cc
@@ -121,29 +121,30 @@ bool TraceControllerImpl::GetKnownCategoriesAsync(TraceSubscriber* subscriber) {
 
 bool TraceControllerImpl::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) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!can_begin_tracing(subscriber))
     return false;
 
   // Enable tracing
-  TraceLog::GetInstance()->SetEnabled(included_categories, excluded_categories);
+  TraceLog::GetInstance()->SetEnabled(included_tag_patterns,
+                                      excluded_tag_patterns);
   OnTracingBegan(subscriber);
 
   return true;
 }
 
 bool TraceControllerImpl::BeginTracing(TraceSubscriber* subscriber,
-                                       const std::string& categories) {
+                                       const std::string& tag_patterns) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!can_begin_tracing(subscriber))
     return false;
 
   // Enable tracing
-  TraceLog::GetInstance()->SetEnabled(categories);
+  TraceLog::GetInstance()->SetEnabled(tag_patterns);
 
   OnTracingBegan(subscriber);
 
@@ -261,7 +262,7 @@ void TraceControllerImpl::AddFilter(TraceMessageFilter* filter) {
 
   filters_.insert(filter);
   if (is_tracing_enabled()) {
-    filter->SendBeginTracing(included_categories_, excluded_categories_);
+    filter->SendBeginTracing(included_tag_patterns_, excluded_tag_patterns_);
     if (!watch_category_.empty())
       filter->SendSetWatchEvent(watch_category_, watch_name_);
   }
@@ -283,11 +284,11 @@ void TraceControllerImpl::OnTracingBegan(TraceSubscriber* subscriber) {
 
   subscriber_ = subscriber;
 
-  TraceLog::GetInstance()->GetEnabledTraceCategories(&included_categories_,
-                                                     &excluded_categories_);
+  TraceLog::GetInstance()->GetEnabledTraceCategories(&included_tag_patterns_,
+                                                     &excluded_tag_patterns_);
   // Notify all child processes.
   for (FilterMap::iterator it = filters_.begin(); it != filters_.end(); ++it) {
-    it->get()->SendBeginTracing(included_categories_, excluded_categories_);
+    it->get()->SendBeginTracing(included_tag_patterns_, excluded_tag_patterns_);
   }
 }