Index: base/time/time_win.cc |
diff --git a/base/time/time_win.cc b/base/time/time_win.cc |
index bc058040d0c7b5a23923383741bbc811713c6485..95841270f1d3f2e2e3c8cbf026fc39f64d65afd0 100644 |
--- a/base/time/time_win.cc |
+++ b/base/time/time_win.cc |
@@ -48,7 +48,6 @@ using base::ThreadTicks; |
using base::Time; |
using base::TimeDelta; |
using base::TimeTicks; |
-using base::TraceTicks; |
namespace { |
@@ -459,14 +458,6 @@ void InitializeNowFunctionPointer() { |
// |
// Otherwise, Now uses the high-resolution QPC clock. As of 21 August 2015, |
// ~72% of users fall within this category. |
- // |
- // TraceTicks::Now() always uses the same clock as TimeTicks::Now(), even |
- // when the QPC exists but is expensive or unreliable. This is because we'd |
- // eventually like to merge TraceTicks and TimeTicks and have one type of |
- // timestamp that is reliable, monotonic, and comparable. Also, while we could |
- // use the high-resolution timer for TraceTicks even when it's unreliable or |
- // slow, it's easier to make tracing tools accommodate a coarse timer than |
- // one that's unreliable or slow. |
NowFunction now_function; |
base::CPU cpu; |
if (ticks_per_sec.QuadPart <= 0 || |
@@ -613,11 +604,6 @@ double ThreadTicks::TSCTicksPerSecond() { |
} |
// static |
-TraceTicks TraceTicks::Now() { |
- return TraceTicks() + g_now_function(); |
-} |
- |
-// static |
TimeTicks TimeTicks::FromQPCValue(LONGLONG qpc_value) { |
return TimeTicks() + QPCValueToTimeDelta(qpc_value); |
} |