Fix TestingPlatformSupportWithMockScheduler::runForPeriodSeconds

third_party/WebKit/Source/platform/TimerTest.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/Timer.h"
 
 #include "platform/scheduler/base/task_queue_impl.h"
 #include "platform/scheduler/child/web_task_runner_impl.h"
 #include "platform/scheduler/renderer/renderer_scheduler_impl.h"
 #include "platform/testing/TestingPlatformSupport.h"
@@ skipping 28 matching lines @@
 
   void recordNextFireTimeTask(TimerBase* timer) {
     m_nextFireTimes.append(monotonicallyIncreasingTime() +
                            timer->nextFireInterval());
   }
 
   void runUntilDeadline(double deadline) {
     double period = deadline - monotonicallyIncreasingTime();
     EXPECT_GE(period, 0.0);
     m_platform.runForPeriodSeconds(period);
-
-    // We may have stopped before the clock advanced to |deadline|.
-    double timeToAdvance = deadline - monotonicallyIncreasingTime();
-    m_platform.advanceClockSeconds(timeToAdvance);
   }
 
   // Returns false if there are no pending delayed tasks, otherwise sets |time|
   // to the delay in seconds till the next pending delayed task is scheduled to
   // fire.
   bool timeTillNextDelayedTask(double* time) const {
     base::TimeTicks nextRunTime;
     if (!m_platform.rendererScheduler()
              ->TimerTaskRunner()
              ->GetTimeDomain()
@@ skipping 387 matching lines @@
   m_platform.advanceClockSeconds(1.9);
   runUntilDeadline(monotonicallyIncreasingTime() + 0.2);
 
   // Next scheduled task to run at m_startTime + 6.0
   m_platform.runForPeriodSeconds(2.0);
   // Next scheduled task to run at m_startTime + 8.0
   m_platform.runForPeriodSeconds(2.1);
   // Next scheduled task to run at m_startTime + 10.0
   m_platform.runForPeriodSeconds(2.9);
   // Next scheduled task to run at m_startTime + 14.0 (skips a beat)
-  m_platform.runForPeriodSeconds(3.1);
+  m_platform.advanceClockSeconds(3.1);
+  m_platform.runUntilIdle();
   // Next scheduled task to run at m_startTime + 18.0 (skips a beat)
-  m_platform.runForPeriodSeconds(4.0);
+  m_platform.advanceClockSeconds(4.0);
+  m_platform.runUntilIdle();
   // Next scheduled task to run at m_startTime + 28.0 (skips 5 beats)
-  m_platform.runForPeriodSeconds(10.0);
+  m_platform.advanceClockSeconds(10.0);
+  m_platform.runUntilIdle();
 
   EXPECT_THAT(
       m_nextFireTimes,
       ElementsAre(m_startTime + 2.0, m_startTime + 4.0, m_startTime + 6.0,
                   m_startTime + 8.0, m_startTime + 10.0, m_startTime + 14.0,
                   m_startTime + 18.0, m_startTime + 28.0));
 }
 
 template <typename TimerFiredClass>
 class TimerForTest : public TaskRunnerTimer<TimerFiredClass> {
@@ skipping 17 matching lines @@
   scheduler::WebTaskRunnerImpl webTaskRunner(taskRunner);
   TimerForTest<TimerTest> timer(&webTaskRunner, this, &TimerTest::countingTask);
   timer.startOneShot(0, BLINK_FROM_HERE);
 
   // Make sure the task was posted on taskRunner.
   EXPECT_FALSE(taskRunner->IsEmpty());
 }
 
 }  // namespace
 }  // namespace blink