Index: chrome/test/base/tracing.cc |
diff --git a/chrome/test/base/tracing.cc b/chrome/test/base/tracing.cc |
index a82b65cc6ec6dadfb479bda49dd3522d7fb34002..51570a2aa5ddf7ee46f9f8de25cf16adb320ef71 100644 |
--- a/chrome/test/base/tracing.cc |
+++ b/chrome/test/base/tracing.cc |
@@ -55,11 +55,10 @@ class InProcessTraceController { |
watch_notification_count_(0) {} |
virtual ~InProcessTraceController() {} |
- bool BeginTracing(const std::string& category_patterns) { |
+ bool BeginTracing(const base::trace_event::TraceConfig& trace_config) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
return content::TracingController::GetInstance()->StartTracing( |
- base::trace_event::TraceConfig(category_patterns, ""), |
- content::TracingController::StartTracingDoneCallback()); |
+ trace_config, content::TracingController::StartTracingDoneCallback()); |
} |
bool BeginTracingWithWatch(const std::string& category_patterns, |
@@ -166,7 +165,7 @@ namespace tracing { |
bool BeginTracing(const std::string& category_patterns) { |
return InProcessTraceController::GetInstance()->BeginTracing( |
- category_patterns); |
+ base::trace_event::TraceConfig(category_patterns, "")); |
} |
bool BeginTracingWithWatch(const std::string& category_patterns, |
@@ -177,6 +176,11 @@ bool BeginTracingWithWatch(const std::string& category_patterns, |
category_patterns, category_name, event_name, num_occurrences); |
} |
+bool BeginTracingWithTraceConfig( |
+ const base::trace_event::TraceConfig& trace_config) { |
+ return InProcessTraceController::GetInstance()->BeginTracing(trace_config); |
+} |
+ |
bool WaitForWatchEvent(base::TimeDelta timeout) { |
return InProcessTraceController::GetInstance()->WaitForWatchEvent(timeout); |
} |