| Index: third_party/WebKit/Source/wtf/CurrentTime.cpp
|
| diff --git a/third_party/WebKit/Source/wtf/CurrentTime.cpp b/third_party/WebKit/Source/wtf/CurrentTime.cpp
|
| index dc64e33663f4e558739a699d96be1a4519a2098d..03f0771c01a2b5c57df941085551b3a72f2cf858 100644
|
| --- a/third_party/WebKit/Source/wtf/CurrentTime.cpp
|
| +++ b/third_party/WebKit/Source/wtf/CurrentTime.cpp
|
| @@ -34,27 +34,36 @@
|
|
|
| namespace WTF {
|
|
|
| -static TimeFunction mockTimeFunctionForTesting = nullptr;
|
| +static TimeFunction mockCurrentTimeFunction = nullptr;
|
| +static TimeFunction mockMonotonicallyIncreasingTimeFunction = nullptr;
|
|
|
| double currentTime()
|
| {
|
| - if (mockTimeFunctionForTesting)
|
| - return mockTimeFunctionForTesting();
|
| + if (mockCurrentTimeFunction)
|
| + return mockCurrentTimeFunction();
|
| return base::Time::Now().ToDoubleT();
|
| }
|
|
|
| double monotonicallyIncreasingTime()
|
| {
|
| - if (mockTimeFunctionForTesting)
|
| - return mockTimeFunctionForTesting();
|
| + if (mockMonotonicallyIncreasingTimeFunction)
|
| + return mockMonotonicallyIncreasingTimeFunction();
|
| return base::TimeTicks::Now().ToInternalValue() / static_cast<double>(base::Time::kMicrosecondsPerSecond);
|
| }
|
|
|
| -TimeFunction setTimeFunctionsForTesting(TimeFunction newFunction)
|
| +TimeFunction setCurrentTimeFunctionForTesting(TimeFunction newFunction)
|
| {
|
| - TimeFunction oldFunction = mockTimeFunctionForTesting;
|
| - mockTimeFunctionForTesting = newFunction;
|
| + TimeFunction oldFunction = mockCurrentTimeFunction;
|
| + mockCurrentTimeFunction = newFunction;
|
| return oldFunction;
|
| }
|
|
|
| +TimeFunction setMonotonicallyIncreasingTimeFunctionForTesting(TimeFunction newFunction)
|
| +{
|
| + TimeFunction oldFunction = mockMonotonicallyIncreasingTimeFunction;
|
| + mockMonotonicallyIncreasingTimeFunction = newFunction;
|
| + return oldFunction;
|
| +}
|
| +
|
| +
|
| } // namespace WTF
|
|
|