Update from https://crrev.com/316786

mojo/common/trace_controller_impl.cc

Index: mojo/common/trace_controller_impl.cc
diff --git a/mojo/common/trace_controller_impl.cc b/mojo/common/trace_controller_impl.cc
index 4409b30a2ba5a296a9aecf053c69948981ee10ca..a5b0ea13a6ff0005dbeebef8841e1707e859700b 100644
--- a/mojo/common/trace_controller_impl.cc
+++ b/mojo/common/trace_controller_impl.cc
@@ -24,16 +24,16 @@ void TraceControllerImpl::StartTracing(
   DCHECK(!collector_.get());
   collector_ = collector.Pass();
   std::string categories_str = categories.To<std::string>();
-  base::debug::TraceLog::GetInstance()->SetEnabled(
-      base::debug::CategoryFilter(categories_str),
-      base::debug::TraceLog::RECORDING_MODE,
-      base::debug::TraceOptions(base::debug::RECORD_UNTIL_FULL));
+  base::trace_event::TraceLog::GetInstance()->SetEnabled(
+      base::trace_event::CategoryFilter(categories_str),
+      base::trace_event::TraceLog::RECORDING_MODE,
+      base::trace_event::TraceOptions(base::trace_event::RECORD_UNTIL_FULL));
 }
 
 void TraceControllerImpl::StopTracing() {
-  base::debug::TraceLog::GetInstance()->SetDisabled();
+  base::trace_event::TraceLog::GetInstance()->SetDisabled();
 
-  base::debug::TraceLog::GetInstance()->Flush(
+  base::trace_event::TraceLog::GetInstance()->Flush(
       base::Bind(&TraceControllerImpl::SendChunk, base::Unretained(this)));
 }