diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2017-12-21 23:53:12 +0000 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2017-12-21 23:53:12 +0000 |
| commit | 618a67a769e94d35a8944051400310c5710a7884 (patch) | |
| tree | 6bb5a209c8ffd63c3c197e938ad4a62b7328b83b | |
| parent | 1c01c739718e65746f393b405a2bf97ce4cf8523 (diff) | |
| download | libchrome-618a67a769e94d35a8944051400310c5710a7884.tar.gz | |
Revert "Mac build fix"
This reverts commit 1c01c739718e65746f393b405a2bf97ce4cf8523.
Reason for revert: Mac build broken (required for merge conflicts).
Change-Id: Ibc4d6e69095ddd320e9e9814daa1a3a0cb11609f
| -rw-r--r-- | base/trace_event/trace_log.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/base/trace_event/trace_log.cc b/base/trace_event/trace_log.cc index 24339253df..d798a9539b 100644 --- a/base/trace_event/trace_log.cc +++ b/base/trace_event/trace_log.cc @@ -1512,14 +1512,13 @@ void TraceLog::AddMetadataEventsWhileLocked() { } #if !defined(OS_NACL) && !defined(OS_IOS) - //TODO: CurrentProcessInfo::CreationTime() is breaking MAC build, uncomment when fixed. - // Time process_creation_time = CurrentProcessInfo::CreationTime(); - // if (!process_creation_time.is_null()) { - // TimeDelta process_uptime = Time::Now() - process_creation_time; - // InitializeMetadataEvent(AddEventToThreadSharedChunkWhileLocked(NULL, false), - // current_thread_id, "process_uptime_seconds", - // "uptime", process_uptime.InSeconds()); - // } + Time process_creation_time = CurrentProcessInfo::CreationTime(); + if (!process_creation_time.is_null()) { + TimeDelta process_uptime = Time::Now() - process_creation_time; + InitializeMetadataEvent(AddEventToThreadSharedChunkWhileLocked(NULL, false), + current_thread_id, "process_uptime_seconds", + "uptime", process_uptime.InSeconds()); + } #endif // !defined(OS_NACL) && !defined(OS_IOS) if (!process_labels_.empty()) { |