Trace category groups and category filter.

content/browser/tracing/trace_controller_impl.h

Index: content/browser/tracing/trace_controller_impl.h
diff --git a/content/browser/tracing/trace_controller_impl.h b/content/browser/tracing/trace_controller_impl.h
index 501f56147de483243c260fdcd5bc9d1ae7281d34..b9d04ad03633844e371de3379104e4eaed7e0629 100644
--- a/content/browser/tracing/trace_controller_impl.h
+++ b/content/browser/tracing/trace_controller_impl.h
@@ -31,18 +31,9 @@ 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.
-  bool BeginTracing(TraceSubscriber* subscriber,
-                    const std::vector<std::string>& included_categories,
-                    const std::vector<std::string>& excluded_categories);
-
-  // TraceController implementation:
+  // TraceController implementation.
   virtual bool BeginTracing(TraceSubscriber* subscriber,
-                            const std::string& categories) OVERRIDE;
+                            const std::string& category_patterns) OVERRIDE;
   virtual  bool EndTracingAsync(TraceSubscriber* subscriber) OVERRIDE;
   virtual bool GetTraceBufferPercentFullAsync(
       TraceSubscriber* subscriber) OVERRIDE;
@@ -102,8 +93,7 @@ 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_;
+  base::debug::CategoryFilter category_filter_;
   std::string watch_category_;
   std::string watch_name_;