Index: media/base/clock.cc |
diff --git a/media/base/clock.cc b/media/base/clock.cc |
index 2432f91e47bf75418de23a12faffde85ccf38215..47dcc3622bc2c7937a1f5b53849deae9132783ac 100644 |
--- a/media/base/clock.cc |
+++ b/media/base/clock.cc |
@@ -6,13 +6,14 @@ |
#include <algorithm> |
+#include "base/clock.h" |
#include "base/logging.h" |
#include "media/base/buffers.h" |
namespace media { |
-Clock::Clock(TimeProvider* time_provider) |
- : time_provider_(time_provider) { |
+Clock::Clock(base::Clock* clock) : clock_(clock) { |
+ DCHECK(clock_); |
Reset(); |
} |
@@ -95,12 +96,6 @@ base::TimeDelta Clock::ElapsedViaProvidedTime(const base::Time& time) const { |
return media_time_ + base::TimeDelta::FromMicroseconds(now_us); |
} |
-base::Time Clock::GetTimeFromProvider() const { |
- if (time_provider_) |
- return time_provider_(); |
- return base::Time(); |
-} |
- |
base::TimeDelta Clock::ClampToValidTimeRange(base::TimeDelta time) const { |
if (duration_ == kNoTimestamp()) |
return base::TimeDelta(); |
@@ -124,12 +119,11 @@ void Clock::UpdateReferencePoints() { |
void Clock::UpdateReferencePoints(base::TimeDelta current_time) { |
media_time_ = ClampToValidTimeRange(current_time); |
- reference_ = GetTimeFromProvider(); |
+ reference_ = clock_->Now(); |
} |
base::TimeDelta Clock::EstimatedElapsedTime() { |
- return ClampToValidTimeRange( |
- ElapsedViaProvidedTime(GetTimeFromProvider())); |
+ return ClampToValidTimeRange(ElapsedViaProvidedTime(clock_->Now())); |
} |
void Clock::Reset() { |