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

Unified Diff: base/trace_event/trace_event_synthetic_delay.cc

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase to ToT mojo Created 5 years, 11 months 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: base/trace_event/trace_event_synthetic_delay.cc
diff --git a/base/debug/trace_event_synthetic_delay.cc b/base/trace_event/trace_event_synthetic_delay.cc
similarity index 98%
rename from base/debug/trace_event_synthetic_delay.cc
rename to base/trace_event/trace_event_synthetic_delay.cc
index 6abfe183572f28dabd4d2b93efafd40c2e80072f..3651611c5842a92ccf601e82992313dbe0feaa0e 100644
--- a/base/debug/trace_event_synthetic_delay.cc
+++ b/base/trace_event/trace_event_synthetic_delay.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/debug/trace_event_synthetic_delay.h"
#include "base/memory/singleton.h"
+#include "base/trace_event/trace_event_synthetic_delay.h"
namespace {
const int kMaxSyntheticDelays = 32;
@@ -184,7 +184,7 @@ TraceEventSyntheticDelay* TraceEventSyntheticDelayRegistry::GetOrCreateDelay(
}
base::TimeTicks TraceEventSyntheticDelayRegistry::Now() {
- return base::TimeTicks::HighResNow();
+ return base::TimeTicks::Now();
}
void TraceEventSyntheticDelayRegistry::ResetAllDelays() {
« no previous file with comments | « base/trace_event/trace_event_synthetic_delay.h ('k') | base/trace_event/trace_event_synthetic_delay_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698