Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(532)

Unified Diff: components/tracing/child_trace_message_filter.cc

Issue 1424703003: Kills TraceTicks, which was functionally the same as TimeTicks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed win compile error. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/tracing/child_trace_message_filter.cc
diff --git a/components/tracing/child_trace_message_filter.cc b/components/tracing/child_trace_message_filter.cc
index ed83bf11054060cdd3555bea39a1a03fc474a5fc..537f6e8e633edd30e497d0303cec27037a24d4f2 100644
--- a/components/tracing/child_trace_message_filter.cc
+++ b/components/tracing/child_trace_message_filter.cc
@@ -68,13 +68,13 @@ ChildTraceMessageFilter::~ChildTraceMessageFilter() {}
void ChildTraceMessageFilter::OnBeginTracing(
const std::string& trace_config_str,
- base::TraceTicks browser_time,
+ base::TimeTicks browser_time,
uint64 tracing_process_id) {
#if defined(__native_client__)
// NaCl and system times are offset by a bit, so subtract some time from
// the captured timestamps. The value might be off by a bit due to messaging
// latency.
- base::TimeDelta time_offset = base::TraceTicks::Now() - browser_time;
+ base::TimeDelta time_offset = base::TimeTicks::Now() - browser_time;
TraceLog::GetInstance()->SetTimeOffset(time_offset);
#endif
ChildMemoryDumpManagerDelegateImpl::GetInstance()->set_tracing_process_id(
@@ -104,8 +104,7 @@ void ChildTraceMessageFilter::OnCancelTracing() {
}
void ChildTraceMessageFilter::OnEnableMonitoring(
- const std::string& trace_config_str,
- base::TraceTicks browser_time) {
+ const std::string& trace_config_str, base::TimeTicks browser_time) {
TraceLog::GetInstance()->SetEnabled(
base::trace_event::TraceConfig(trace_config_str),
base::trace_event::TraceLog::MONITORING_MODE);
« no previous file with comments | « components/tracing/child_trace_message_filter.h ('k') | components/tracing/child_trace_message_filter_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698