Chromium Code Reviews| Index: chrome/test/base/tracing.cc |
| diff --git a/chrome/test/base/tracing.cc b/chrome/test/base/tracing.cc |
| index 87e6aaa34342a684e1e3775b93c5ccb7320414ce..03a53f1e1d5c025eaded15f8ed2c84b618d29284 100644 |
| --- a/chrome/test/base/tracing.cc |
| +++ b/chrome/test/base/tracing.cc |
| @@ -4,6 +4,7 @@ |
| #include "chrome/test/base/tracing.h" |
| +#include "base/debug/trace_event.h" |
| #include "base/file_util.h" |
| #include "base/files/file_path.h" |
| #include "base/memory/singleton.h" |
| @@ -32,7 +33,8 @@ class InProcessTraceController { |
| bool BeginTracing(const std::string& category_patterns) { |
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| return content::TracingController::GetInstance()->EnableRecording( |
| - category_patterns, content::TracingController::DEFAULT_OPTIONS, |
| + base::debug::CategoryFilter(category_patterns), |
|
dsinclair
2014/07/30 14:25:25
Why did this change? Seems unrelated to the rest o
nednguyen
2014/07/30 16:51:14
I also refactor TracingController to use CategoryF
|
| + base::debug::TraceOptions(), |
| content::TracingController::EnableRecordingDoneCallback()); |
| } |
| @@ -50,7 +52,8 @@ class InProcessTraceController { |
| return false; |
| } |
| if (!content::TracingController::GetInstance()->EnableRecording( |
| - category_patterns, content::TracingController::DEFAULT_OPTIONS, |
| + base::debug::CategoryFilter(category_patterns), |
|
dsinclair
2014/07/30 14:25:25
dito.
nednguyen
2014/07/30 16:51:14
Acknowledged.
|
| + base::debug::TraceOptions(), |
| base::Bind(&InProcessTraceController::OnEnableTracingComplete, |
| base::Unretained(this)))) { |
| return false; |