diff options
| -rw-r--r-- | base/profiler/tracked_time.cc | 8 | ||||
| -rw-r--r-- | base/time/time.h | 3 | ||||
| -rw-r--r-- | base/time/time_win.cc | 8 |
3 files changed, 0 insertions, 19 deletions
diff --git a/base/profiler/tracked_time.cc b/base/profiler/tracked_time.cc index 0121038..e5da68f 100644 --- a/base/profiler/tracked_time.cc +++ b/base/profiler/tracked_time.cc @@ -51,15 +51,7 @@ TrackedTime::TrackedTime(const base::TimeTicks& time) // static TrackedTime TrackedTime::Now() { -#if defined(OS_WIN) - // Use lock-free accessor to 32 bit time. - // Note that TimeTicks::Now() is built on this, so we have "compatible" - // times when we down-convert a TimeTicks sample. - return TrackedTime(base::TimeTicks::UnprotectedNow()); -#else - // Posix has nice cheap 64 bit times, so we just down-convert it. return TrackedTime(base::TimeTicks::Now()); -#endif // OS_WIN } Duration TrackedTime::operator-(const TrackedTime& other) const { diff --git a/base/time/time.h b/base/time/time.h index 9cb007e..d61a351 100644 --- a/base/time/time.h +++ b/base/time/time.h @@ -634,9 +634,6 @@ class BASE_EXPORT TimeTicks { // Returns true if the high resolution clock is working on this system. // This is only for testing. static bool IsHighResClockWorking(); - - // Returns a time value that is NOT rollover protected. - static TimeTicks UnprotectedNow(); #endif // Returns true if this object has not been initialized. diff --git a/base/time/time_win.cc b/base/time/time_win.cc index 0061180..9b4f17d 100644 --- a/base/time/time_win.cc +++ b/base/time/time_win.cc @@ -540,14 +540,6 @@ bool TimeTicks::IsHighResClockWorking() { return GetHighResNowSingleton()->IsUsingHighResClock(); } -TimeTicks TimeTicks::UnprotectedNow() { - if (now_function == HighResNowWrapper) { - return Now(); - } else { - return TimeTicks() + TimeDelta::FromMilliseconds(timeGetTime()); - } -} - // TimeDelta ------------------------------------------------------------------ // static |