Index: base/time_win.cc |
diff --git a/base/time_win.cc b/base/time_win.cc |
index 6d8e4328b3000b3bc3b04a3dbe6b16fe3606fc16..ab308157ef7092f8663bdc8f2ba2d4d14854b9b9 100644 |
--- a/base/time_win.cc |
+++ b/base/time_win.cc |
@@ -103,6 +103,9 @@ int Time::high_resolution_timer_activated_ = 0; |
// static |
Time Time::Now() { |
+ if (TimeFactory::instance()) |
+ return TimeFactory::instance()->TimeNow(); |
+ |
if (initial_time == 0) |
InitializeClock(); |
@@ -451,11 +454,17 @@ TimeTicks::TickFunctionType TimeTicks::SetMockTickFunction( |
// static |
TimeTicks TimeTicks::Now() { |
+ if (TimeFactory::instance()) |
+ return TimeFactory::instance()->TimeTicksNow(); |
+ |
return TimeTicks() + RolloverProtectedNow(); |
} |
// static |
TimeTicks TimeTicks::HighResNow() { |
+ if (TimeFactory::instance()) |
+ return TimeFactory::instance()->TimeTicksHighResNow(); |
+ |
return TimeTicks() + HighResNowSingleton::GetInstance()->Now(); |
} |