| Index: chrome/test/base/tracing.cc
|
| diff --git a/chrome/test/base/tracing.cc b/chrome/test/base/tracing.cc
|
| index 7d727535bd6f93b409a3f8282e5212e5937ee364..f9d9f57a9b6ef4e1d861d7095eaf5f9a143faeaf 100644
|
| --- a/chrome/test/base/tracing.cc
|
| +++ b/chrome/test/base/tracing.cc
|
| @@ -57,8 +57,8 @@ class InProcessTraceController {
|
| bool BeginTracing(const std::string& category_patterns) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| return content::TracingController::GetInstance()->EnableRecording(
|
| - base::debug::CategoryFilter(category_patterns),
|
| - base::debug::TraceOptions(),
|
| + base::trace_event::CategoryFilter(category_patterns),
|
| + base::trace_event::TraceOptions(),
|
| content::TracingController::EnableRecordingDoneCallback());
|
| }
|
|
|
| @@ -76,8 +76,8 @@ class InProcessTraceController {
|
| return false;
|
| }
|
| if (!content::TracingController::GetInstance()->EnableRecording(
|
| - base::debug::CategoryFilter(category_patterns),
|
| - base::debug::TraceOptions(),
|
| + base::trace_event::CategoryFilter(category_patterns),
|
| + base::trace_event::TraceOptions(),
|
| base::Bind(&InProcessTraceController::OnEnableTracingComplete,
|
| base::Unretained(this)))) {
|
| return false;
|
|
|