Fixit: Fork base::TimeTicks --> TimeTicks + ThreadTicks + TraceTicks

components/tracing/child_trace_message_filter.cc

Index: components/tracing/child_trace_message_filter.cc
diff --git a/components/tracing/child_trace_message_filter.cc b/components/tracing/child_trace_message_filter.cc
index 194f0972e0328390927304522f2fe91a933ecb3d..14dec52533a2dfae69fd0451ea38b2d7fe790f56 100644
--- a/components/tracing/child_trace_message_filter.cc
+++ b/components/tracing/child_trace_message_filter.cc
@@ -59,14 +59,13 @@ ChildTraceMessageFilter::~ChildTraceMessageFilter() {}
 
 void ChildTraceMessageFilter::OnBeginTracing(
     const std::string& category_filter_str,
-    base::TimeTicks browser_time,
+    base::TraceTicks browser_time,
     const std::string& options) {
 #if defined(__native_client__)
   // NaCl and system times are offset by a bit, so subtract some time from
   // the captured timestamps. The value might be off by a bit due to messaging
   // latency.
-  base::TimeDelta time_offset = base::TimeTicks::NowFromSystemTraceTime() -
-      browser_time;
+  base::TimeDelta time_offset = base::TraceTicks::Now() - browser_time;
   TraceLog::GetInstance()->SetTimeOffset(time_offset);
 #endif
   base::trace_event::TraceOptions trace_options;
@@ -90,7 +89,7 @@ void ChildTraceMessageFilter::OnEndTracing() {
 
 void ChildTraceMessageFilter::OnEnableMonitoring(
     const std::string& category_filter_str,
-    base::TimeTicks browser_time,
+    base::TraceTicks browser_time,
     const std::string& options) {
   base::trace_event::TraceOptions trace_options;
   trace_options.SetFromString(options);