| Index: ppapi/shared_impl/ppb_trace_event_impl.cc
|
| diff --git a/ppapi/shared_impl/ppb_trace_event_impl.cc b/ppapi/shared_impl/ppb_trace_event_impl.cc
|
| index c31194240c68774edc4a6c4243226f2380707327..1fc2bc3a3d6c6b78601e217f1a2f9571191807ea 100644
|
| --- a/ppapi/shared_impl/ppb_trace_event_impl.cc
|
| +++ b/ppapi/shared_impl/ppb_trace_event_impl.cc
|
| @@ -24,7 +24,7 @@ void* TraceEventImpl::GetCategoryEnabled(const char* category_name) {
|
| // return a pointer type to the caller without some const_cast. The pointer
|
| // type the tracing system works with is normally unsigned char*.
|
| return const_cast<void*>(static_cast<const void*>(
|
| - base::debug::TraceLog::GetInstance()->GetCategoryGroupEnabled(
|
| + base::trace_event::TraceLog::GetInstance()->GetCategoryGroupEnabled(
|
| category_name)));
|
| }
|
|
|
| @@ -42,7 +42,7 @@ void TraceEventImpl::AddTraceEvent(int8_t phase,
|
| static_assert(sizeof(unsigned long long) == sizeof(uint64_t),
|
| "unexpected data type sizes");
|
|
|
| - base::debug::TraceLog::GetInstance()->AddTraceEvent(
|
| + base::trace_event::TraceLog::GetInstance()->AddTraceEvent(
|
| phase,
|
| static_cast<const unsigned char*>(category_enabled),
|
| name,
|
| @@ -72,16 +72,17 @@ void TraceEventImpl::AddTraceEventWithThreadIdAndTimestamp(
|
| const uint8_t arg_types[],
|
| const uint64_t arg_values[],
|
| uint8_t flags) {
|
| - base::debug::TraceLog::GetInstance()->AddTraceEventWithThreadIdAndTimestamp(
|
| - phase,
|
| - static_cast<const unsigned char*>(category_enabled),
|
| - name,
|
| - id,
|
| - thread_id,
|
| - base::TimeTicks::FromInternalValue(timestamp),
|
| - num_args,
|
| - arg_names,
|
| - arg_types,
|
| + base::trace_event::TraceLog::GetInstance()
|
| + ->AddTraceEventWithThreadIdAndTimestamp(
|
| + phase,
|
| + static_cast<const unsigned char*>(category_enabled),
|
| + name,
|
| + id,
|
| + thread_id,
|
| + base::TimeTicks::FromInternalValue(timestamp),
|
| + num_args,
|
| + arg_names,
|
| + arg_types,
|
| // This cast is necessary for LP64 systems, where uint64_t is defined as
|
| // an unsigned long int, but trace_event internals are hermetic and
|
| // accepts an |unsigned long long*|. The pointer types are compatible but
|
|
|