Index: base/trace_event/trace_event_unittest.cc |
diff --git a/base/trace_event/trace_event_unittest.cc b/base/trace_event/trace_event_unittest.cc |
index 9f694a58b5f4fe776d8f5495fa5a444a79f6f19b..084c25011319367958049d3bd41a3453ae6b6797 100644 |
--- a/base/trace_event/trace_event_unittest.cc |
+++ b/base/trace_event/trace_event_unittest.cc |
@@ -2362,10 +2362,10 @@ class TraceEventCallbackTest : public TraceEventTestFixture { |
std::vector<std::string> collected_events_categories_; |
std::vector<std::string> collected_events_names_; |
std::vector<unsigned char> collected_events_phases_; |
- std::vector<TraceTicks> collected_events_timestamps_; |
+ std::vector<TimeTicks> collected_events_timestamps_; |
static TraceEventCallbackTest* s_instance; |
- static void Callback(TraceTicks timestamp, |
+ static void Callback(TimeTicks timestamp, |
char phase, |
const unsigned char* category_group_enabled, |
const char* name, |
@@ -2551,9 +2551,9 @@ TEST_F(TraceEventTestFixture, TraceBufferVectorReportFull) { |
TraceBuffer::CreateTraceBufferVectorOfSize(100)); |
do { |
TRACE_EVENT_BEGIN_WITH_ID_TID_AND_TIMESTAMP0( |
- "all", "with_timestamp", 0, 0, TraceTicks::Now().ToInternalValue()); |
+ "all", "with_timestamp", 0, 0, TimeTicks::Now().ToInternalValue()); |
TRACE_EVENT_END_WITH_ID_TID_AND_TIMESTAMP0( |
- "all", "with_timestamp", 0, 0, TraceTicks::Now().ToInternalValue()); |
+ "all", "with_timestamp", 0, 0, TimeTicks::Now().ToInternalValue()); |
} while (!trace_log->BufferIsFull()); |
EndTraceAndFlush(); |
@@ -2926,7 +2926,7 @@ TEST_F(TraceEventTestFixture, EchoToConsoleTraceEventRecursion) { |
TEST_F(TraceEventTestFixture, TimeOffset) { |
BeginTrace(); |
// Let TraceLog timer start from 0. |
- TimeDelta time_offset = TraceTicks::Now() - TraceTicks(); |
+ TimeDelta time_offset = TimeTicks::Now() - TimeTicks(); |
TraceLog::GetInstance()->SetTimeOffset(time_offset); |
{ |
@@ -2934,15 +2934,15 @@ TEST_F(TraceEventTestFixture, TimeOffset) { |
TRACE_EVENT0("all", "duration2"); |
} |
TRACE_EVENT_BEGIN_WITH_ID_TID_AND_TIMESTAMP0( |
- "all", "with_timestamp", 0, 0, TraceTicks::Now().ToInternalValue()); |
+ "all", "with_timestamp", 0, 0, TimeTicks::Now().ToInternalValue()); |
TRACE_EVENT_END_WITH_ID_TID_AND_TIMESTAMP0( |
- "all", "with_timestamp", 0, 0, TraceTicks::Now().ToInternalValue()); |
+ "all", "with_timestamp", 0, 0, TimeTicks::Now().ToInternalValue()); |
EndTraceAndFlush(); |
DropTracedMetadataRecords(); |
double end_time = static_cast<double>( |
- (TraceTicks::Now() - time_offset).ToInternalValue()); |
+ (TimeTicks::Now() - time_offset).ToInternalValue()); |
double last_timestamp = 0; |
for (size_t i = 0; i < trace_parsed_.GetSize(); ++i) { |
const DictionaryValue* item; |