Update from https://crrev.com/333737

base/trace_event/trace_event_android.cc

Index: base/trace_event/trace_event_android.cc
diff --git a/base/trace_event/trace_event_android.cc b/base/trace_event/trace_event_android.cc
index 26bd0c777d4be216db025546b9d2f4932e0b1395..465649d44d5acb5b4633ee6af72cf365148130f5 100644
--- a/base/trace_event/trace_event_android.cc
+++ b/base/trace_event/trace_event_android.cc
@@ -97,9 +97,9 @@ void TraceLog::StartATrace() {
     PLOG(WARNING) << "Couldn't open " << kATraceMarkerFile;
     return;
   }
-  SetEnabled(CategoryFilter(CategoryFilter::kDefaultCategoryFilterString),
-             TraceLog::RECORDING_MODE,
-             TraceOptions(RECORD_CONTINUOUSLY));
+  TraceConfig trace_config;
+  trace_config.SetTraceRecordMode(RECORD_CONTINUOUSLY);
+  SetEnabled(trace_config, TraceLog::RECORDING_MODE);
 }
 
 void TraceLog::StopATrace() {
@@ -187,8 +187,7 @@ void TraceLog::AddClockSyncMetadataEvent() {
   // debugfs that takes the written data and pushes it onto the trace
   // buffer. So, to establish clock sync, we write our monotonic clock into that
   // trace buffer.
-  TimeTicks now = TimeTicks::NowFromSystemTraceTime();
-  double now_in_seconds = now.ToInternalValue() / 1000000.0;
+  double now_in_seconds = (TraceTicks::Now() - TraceTicks()).InSecondsF();
   std::string marker = StringPrintf(
       "trace_event_clock_sync: parent_ts=%f\n", now_in_seconds);
   if (write(atrace_fd, marker.c_str(), marker.size()) == -1)