| Index: base/trace_event/trace_event_impl.cc
|
| diff --git a/base/trace_event/trace_event_impl.cc b/base/trace_event/trace_event_impl.cc
|
| index 778ecbf0b908b168884a94e56ef6f23a98400889..7e63f72e51b2224db78ae4285f4216cace330caf 100644
|
| --- a/base/trace_event/trace_event_impl.cc
|
| +++ b/base/trace_event/trace_event_impl.cc
|
| @@ -79,7 +79,7 @@ void TraceEvent::CopyFrom(const TraceEvent& other) {
|
|
|
| void TraceEvent::Initialize(
|
| int thread_id,
|
| - TraceTicks timestamp,
|
| + TimeTicks timestamp,
|
| ThreadTicks thread_timestamp,
|
| char phase,
|
| const unsigned char* category_group_enabled,
|
| @@ -177,7 +177,7 @@ void TraceEvent::Reset() {
|
| convertable_values_[i] = NULL;
|
| }
|
|
|
| -void TraceEvent::UpdateDuration(const TraceTicks& now,
|
| +void TraceEvent::UpdateDuration(const TimeTicks& now,
|
| const ThreadTicks& thread_now) {
|
| DCHECK_EQ(duration_.ToInternalValue(), -1);
|
| duration_ = now - timestamp_;
|
|
|