Index: base/trace_event/trace_event.h |
diff --git a/base/trace_event/trace_event.h b/base/trace_event/trace_event.h |
index 37320ea736d0f7694945d0618a462ff23a9a25b5..95ea215939fe48a7617aa7bb93ad1e490f9b401d 100644 |
--- a/base/trace_event/trace_event.h |
+++ b/base/trace_event/trace_event.h |
@@ -154,7 +154,7 @@ |
// unsigned long long id, |
// unsigned long long context_id, |
// int thread_id, |
-// const TraceTicks& timestamp, |
+// const TimeTicks& timestamp, |
// int num_args, |
// const char** arg_names, |
// const unsigned char* arg_types, |
@@ -313,7 +313,7 @@ TRACE_EVENT_API_CLASS_EXPORT extern \ |
trace_event_internal::AddTraceEventWithThreadIdAndTimestamp( \ |
phase, INTERNAL_TRACE_EVENT_UID(category_group_enabled), \ |
name, trace_event_trace_id.data(), trace_event_internal::kNoId, \ |
- thread_id, base::TraceTicks::FromInternalValue(timestamp), \ |
+ thread_id, base::TimeTicks::FromInternalValue(timestamp), \ |
trace_event_flags | TRACE_EVENT_FLAG_EXPLICIT_TIMESTAMP, \ |
trace_event_internal::kNoId, ##__VA_ARGS__); \ |
} \ |
@@ -517,13 +517,6 @@ static inline void SetTraceValue(const base::ThreadTicks arg, |
*value = arg.ToInternalValue(); |
} |
-static inline void SetTraceValue(const base::TraceTicks arg, |
- unsigned char* type, |
- unsigned long long* value) { |
- *type = TRACE_VALUE_TYPE_INT; |
- *value = arg.ToInternalValue(); |
-} |
- |
// These AddTraceEvent and AddTraceEventWithThreadIdAndTimestamp template |
// functions are defined here instead of in the macro, because the arg_values |
// could be temporary objects, such as std::string. In order to store |
@@ -538,7 +531,7 @@ AddTraceEventWithThreadIdAndTimestamp( |
unsigned long long id, |
unsigned long long context_id, |
int thread_id, |
- const base::TraceTicks& timestamp, |
+ const base::TimeTicks& timestamp, |
unsigned int flags, |
unsigned long long bind_id, |
const char* arg1_name, |
@@ -560,7 +553,7 @@ AddTraceEventWithThreadIdAndTimestamp( |
unsigned long long id, |
unsigned long long context_id, |
int thread_id, |
- const base::TraceTicks& timestamp, |
+ const base::TimeTicks& timestamp, |
unsigned int flags, |
unsigned long long bind_id, |
const char* arg1_name, |
@@ -595,7 +588,7 @@ AddTraceEventWithThreadIdAndTimestamp( |
unsigned long long id, |
unsigned long long context_id, |
int thread_id, |
- const base::TraceTicks& timestamp, |
+ const base::TimeTicks& timestamp, |
unsigned int flags, |
unsigned long long bind_id, |
const char* arg1_name, |
@@ -629,7 +622,7 @@ AddTraceEventWithThreadIdAndTimestamp( |
unsigned long long id, |
unsigned long long context_id, |
int thread_id, |
- const base::TraceTicks& timestamp, |
+ const base::TimeTicks& timestamp, |
unsigned int flags, |
unsigned long long bind_id, |
const char* arg1_name, |
@@ -658,7 +651,7 @@ AddTraceEventWithThreadIdAndTimestamp( |
unsigned long long id, |
unsigned long long context_id, |
int thread_id, |
- const base::TraceTicks& timestamp, |
+ const base::TimeTicks& timestamp, |
unsigned int flags, |
unsigned long long bind_id) { |
return TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP( |
@@ -674,7 +667,7 @@ static inline base::trace_event::TraceEventHandle AddTraceEvent( |
unsigned int flags, |
unsigned long long bind_id) { |
const int thread_id = static_cast<int>(base::PlatformThread::CurrentId()); |
- const base::TraceTicks now = base::TraceTicks::Now(); |
+ const base::TimeTicks now = base::TimeTicks::Now(); |
return AddTraceEventWithThreadIdAndTimestamp(phase, category_group_enabled, |
name, id, kNoId, thread_id, now, |
flags, bind_id); |
@@ -689,7 +682,7 @@ AddTraceEventWithThreadIdAndTimestamp( |
unsigned long long id, |
unsigned long long context_id, |
int thread_id, |
- const base::TraceTicks& timestamp, |
+ const base::TimeTicks& timestamp, |
unsigned int flags, |
unsigned long long bind_id, |
const char* arg1_name, |
@@ -714,7 +707,7 @@ static inline base::trace_event::TraceEventHandle AddTraceEvent( |
const char* arg1_name, |
const ARG1_TYPE& arg1_val) { |
int thread_id = static_cast<int>(base::PlatformThread::CurrentId()); |
- base::TraceTicks now = base::TraceTicks::Now(); |
+ base::TimeTicks now = base::TimeTicks::Now(); |
return AddTraceEventWithThreadIdAndTimestamp(phase, category_group_enabled, |
name, id, kNoId, thread_id, now, |
flags, bind_id, |
@@ -730,7 +723,7 @@ AddTraceEventWithThreadIdAndTimestamp( |
unsigned long long id, |
unsigned long long context_id, |
int thread_id, |
- const base::TraceTicks& timestamp, |
+ const base::TimeTicks& timestamp, |
unsigned int flags, |
unsigned long long bind_id, |
const char* arg1_name, |
@@ -761,7 +754,7 @@ static inline base::trace_event::TraceEventHandle AddTraceEvent( |
const char* arg2_name, |
const ARG2_TYPE& arg2_val) { |
int thread_id = static_cast<int>(base::PlatformThread::CurrentId()); |
- base::TraceTicks now = base::TraceTicks::Now(); |
+ base::TimeTicks now = base::TimeTicks::Now(); |
return AddTraceEventWithThreadIdAndTimestamp(phase, category_group_enabled, |
name, id, kNoId, thread_id, now, |
flags, bind_id, |