[Reland] Per WebViewScheduler virtual time

third_party/WebKit/Source/platform/TimerTest.cpp

Index: third_party/WebKit/Source/platform/TimerTest.cpp
diff --git a/third_party/WebKit/Source/platform/TimerTest.cpp b/third_party/WebKit/Source/platform/TimerTest.cpp
index 9bbb0a7149c1d32a8b5a44358e2483730f2bacd4..a088adef58f7df6f6a54d3e9d62af54bbefbf8d7 100644
--- a/third_party/WebKit/Source/platform/TimerTest.cpp
+++ b/third_party/WebKit/Source/platform/TimerTest.cpp
@@ -19,11 +19,6 @@ namespace blink {
 namespace {
 double gCurrentTimeSecs = 0.0;
 
-double currentTime()
-{
-    return gCurrentTimeSecs;
-}
-
 // This class exists because gcc doesn't know how to move an OwnPtr.
 class RefCountedTaskContainer : public RefCounted<RefCountedTaskContainer> {
 public:
@@ -44,7 +39,7 @@ class DelayedTask {
 public:
     DelayedTask(WebTaskRunner::Task* task, double delaySeconds)
         : m_task(adoptRef(new RefCountedTaskContainer(task)))
-        , m_runTimeSeconds(monotonicallyIncreasingTime() + delaySeconds)
+        , m_runTimeSeconds(gCurrentTimeSecs + delaySeconds)
         , m_delaySeconds(delaySeconds) { }
 
     bool operator<(const DelayedTask& other) const
@@ -267,6 +262,11 @@ public:
         return mockScheduler()->nextTimerTaskDelaySecs();
     }
 
+    double monotonicallyIncreasingVirtualTimeSeconds() override
+    {
+        return gCurrentTimeSecs;
+    }
+
 private:
     MockWebScheduler* mockScheduler() const
     {
@@ -280,8 +280,6 @@ class TimerTest : public testing::Test {
 public:
     void SetUp() override
     {
-        WTF::setMonotonicallyIncreasingTimeFunction(currentTime);
-
         m_runTimes.clear();
         gCurrentTimeSecs = 10.0;
         m_startTime = gCurrentTimeSecs;
@@ -289,12 +287,12 @@ public:
 
     void countingTask(Timer<TimerTest>*)
     {
-        m_runTimes.append(monotonicallyIncreasingTime());
+        m_runTimes.append(gCurrentTimeSecs);
     }
 
     void recordNextFireTimeTask(Timer<TimerTest>* timer)
     {
-        m_nextFireTimes.append(monotonicallyIncreasingTime() + timer->nextFireInterval());
+        m_nextFireTimes.append(gCurrentTimeSecs + timer->nextFireInterval());
     }
 
     void advanceTimeBy(double timeSecs)
@@ -443,7 +441,7 @@ TEST_F(TimerTest, StartOneShot_NonZeroAndCancelThenRepost)
     runUntilIdle();
     EXPECT_FALSE(m_runTimes.size());
 
-    double secondPostTime = monotonicallyIncreasingTime();
+    double secondPostTime = gCurrentTimeSecs;
     timer.startOneShot(10, BLINK_FROM_HERE);
 
     ASSERT(hasOneTimerTask());