[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 4284a625be935ceb275490158838a1b5d4dd24c1..61cc4c0a8ad83550408cd52e4efd587516c65ca3 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,8 +39,10 @@ class DelayedTask {
 public:
     DelayedTask(WebTaskRunner::Task* task, double delaySeconds)
         : m_task(adoptRef(new RefCountedTaskContainer(task)))
-        , m_runTimeSeconds(monotonicallyIncreasingTime() + delaySeconds)
-        , m_delaySeconds(delaySeconds) { }
+        , m_runTimeSeconds(gCurrentTimeSecs + delaySeconds)
+        , m_delaySeconds(delaySeconds)
+    {
+    }
 
     bool operator<(const DelayedTask& other) const
     {
@@ -94,6 +91,17 @@ public:
         return nullptr;
     }
 
+    double virtualTimeSeconds() const override
+    {
+        ASSERT_NOT_REACHED();
+        return 0.0;
+    }
+
+    double monotonicallyIncreasingVirtualTimeSeconds() const override
+    {
+        return gCurrentTimeSecs;
+    }
+
     std::priority_queue<DelayedTask>* m_timerTasks; // NOT OWNED
 };
 
@@ -280,26 +288,19 @@ class TimerTest : public testing::Test {
 public:
     void SetUp() override
     {
-        m_originalTimeFunction = setTimeFunctionsForTesting(currentTime);
-
         m_runTimes.clear();
         gCurrentTimeSecs = 10.0;
         m_startTime = gCurrentTimeSecs;
     }
 
-    void TearDown() override
-    {
-        setTimeFunctionsForTesting(m_originalTimeFunction);
-    }
-
     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)
@@ -339,7 +340,6 @@ protected:
 
 private:
     TimerTestPlatform m_platform;
-    TimeFunction m_originalTimeFunction;
 };
 
 TEST_F(TimerTest, StartOneShot_Zero)
@@ -449,7 +449,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());