TestingPlatformSupport: register Platform instance correctly

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"
 #include "public/platform/Platform.h"
 #include "public/platform/WebScheduler.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebViewScheduler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/RefCounted.h"
 #include <memory>
 #include <queue>
 
 using testing::ElementsAre;
 
 namespace blink {
 namespace {
 
 class TimerTest : public testing::Test {
  public:
-  void SetUp() override {
+  void setupTimes(

[Takashi Toyoshima, 2017/01/12 08:56:13]

Changes in this class are also unfortunate, but...

[haraken, 2017/01/12 11:21:00]

setupTimes => initialize ?

[Takashi Toyoshima, 2017/01/12 12:13:01]

Done.

+      ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>&
+          platform) {
     m_runTimes.clear();
-    m_platform.advanceClockSeconds(10.0);
+    platform->advanceClockSeconds(10.0);
     m_startTime = monotonicallyIncreasingTime();
   }
 
   void countingTask(TimerBase*) {
     m_runTimes.push_back(monotonicallyIncreasingTime());
   }
 
   void recordNextFireTimeTask(TimerBase* timer) {
     m_nextFireTimes.push_back(monotonicallyIncreasingTime() +
                               timer->nextFireInterval());
   }
 
-  void runUntilDeadline(double deadline) {
+  void runUntilDeadline(ScopedTestingPlatformSupport<
+                            TestingPlatformSupportWithMockScheduler>& platform,
+                        double deadline) {
     double period = deadline - monotonicallyIncreasingTime();
     EXPECT_GE(period, 0.0);
-    m_platform.runForPeriodSeconds(period);
+    platform->runForPeriodSeconds(period);
   }
 
   // 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 {
+  bool timeTillNextDelayedTask(
+      ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>&
+          platform,
+      double* time) const {
     base::TimeTicks nextRunTime;
-    if (!m_platform.rendererScheduler()
+    if (!platform->rendererScheduler()
              ->TimerTaskRunner()
              ->GetTimeDomain()
              ->NextScheduledRunTime(&nextRunTime))
       return false;
     *time = (nextRunTime -
-             m_platform.rendererScheduler()
+             platform->rendererScheduler()
                  ->TimerTaskRunner()
                  ->GetTimeDomain()
                  ->Now())
                 .InSecondsF();
     return true;
   }
 
  protected:
   double m_startTime;
   WTF::Vector<double> m_runTimes;
   WTF::Vector<double> m_nextFireTimes;
-  TestingPlatformSupportWithMockScheduler m_platform;
 };
 
 class OnHeapTimerOwner final
     : public GarbageCollectedFinalized<OnHeapTimerOwner> {
  public:
   class Record final : public RefCounted<Record> {
    public:
     static PassRefPtr<Record> create() { return adoptRef(new Record); }
 
     bool timerHasFired() const { return m_timerHasFired; }
@@ skipping 32 matching lines @@
 };
 
 class GCForbiddenScope final {
  public:
   STACK_ALLOCATED();
   GCForbiddenScope() { ThreadState::current()->enterGCForbiddenScope(); }
   ~GCForbiddenScope() { ThreadState::current()->leaveGCForbiddenScope(); }
 };
 
 TEST_F(TimerTest, StartOneShot_Zero) {
-  Timer<TimerTest> timer(this, &TimerTest::countingTask);
-  timer.startOneShot(0, BLINK_FROM_HERE);
-
-  double runTime;
-  EXPECT_FALSE(timeTillNextDelayedTask(&runTime));
-
-  m_platform.runUntilIdle();
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
+  Timer<TimerTest> timer(this, &TimerTest::countingTask);
+  timer.startOneShot(0, BLINK_FROM_HERE);
+
+  double runTime;
+  EXPECT_FALSE(timeTillNextDelayedTask(platform, &runTime));
+
+  platform->runUntilIdle();
   EXPECT_THAT(m_runTimes, ElementsAre(m_startTime));
 }
 
 TEST_F(TimerTest, StartOneShot_ZeroAndCancel) {
-  Timer<TimerTest> timer(this, &TimerTest::countingTask);
-  timer.startOneShot(0, BLINK_FROM_HERE);
-
-  double runTime;
-  EXPECT_FALSE(timeTillNextDelayedTask(&runTime));
-
-  timer.stop();
-
-  m_platform.runUntilIdle();
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
+  Timer<TimerTest> timer(this, &TimerTest::countingTask);
+  timer.startOneShot(0, BLINK_FROM_HERE);
+
+  double runTime;
+  EXPECT_FALSE(timeTillNextDelayedTask(platform, &runTime));
+
+  timer.stop();
+
+  platform->runUntilIdle();
   EXPECT_FALSE(m_runTimes.size());
 }
 
 TEST_F(TimerTest, StartOneShot_ZeroAndCancelThenRepost) {
-  Timer<TimerTest> timer(this, &TimerTest::countingTask);
-  timer.startOneShot(0, BLINK_FROM_HERE);
-
-  double runTime;
-  EXPECT_FALSE(timeTillNextDelayedTask(&runTime));
-
-  timer.stop();
-
-  m_platform.runUntilIdle();
-  EXPECT_FALSE(m_runTimes.size());
-
-  timer.startOneShot(0, BLINK_FROM_HERE);
-
-  EXPECT_FALSE(timeTillNextDelayedTask(&runTime));
-
-  m_platform.runUntilIdle();
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
+  Timer<TimerTest> timer(this, &TimerTest::countingTask);
+  timer.startOneShot(0, BLINK_FROM_HERE);
+
+  double runTime;
+  EXPECT_FALSE(timeTillNextDelayedTask(platform, &runTime));
+
+  timer.stop();
+
+  platform->runUntilIdle();
+  EXPECT_FALSE(m_runTimes.size());
+
+  timer.startOneShot(0, BLINK_FROM_HERE);
+
+  EXPECT_FALSE(timeTillNextDelayedTask(platform, &runTime));
+
+  platform->runUntilIdle();
   EXPECT_THAT(m_runTimes, ElementsAre(m_startTime));
 }
 
 TEST_F(TimerTest, StartOneShot_Zero_RepostingAfterRunning) {
-  Timer<TimerTest> timer(this, &TimerTest::countingTask);
-  timer.startOneShot(0, BLINK_FROM_HERE);
-
-  double runTime;
-  EXPECT_FALSE(timeTillNextDelayedTask(&runTime));
-
-  m_platform.runUntilIdle();
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
+  Timer<TimerTest> timer(this, &TimerTest::countingTask);
+  timer.startOneShot(0, BLINK_FROM_HERE);
+
+  double runTime;
+  EXPECT_FALSE(timeTillNextDelayedTask(platform, &runTime));
+
+  platform->runUntilIdle();
   EXPECT_THAT(m_runTimes, ElementsAre(m_startTime));
 
   timer.startOneShot(0, BLINK_FROM_HERE);
 
-  EXPECT_FALSE(timeTillNextDelayedTask(&runTime));
-
-  m_platform.runUntilIdle();
+  EXPECT_FALSE(timeTillNextDelayedTask(platform, &runTime));
+
+  platform->runUntilIdle();
   EXPECT_THAT(m_runTimes, ElementsAre(m_startTime, m_startTime));
 }
 
 TEST_F(TimerTest, StartOneShot_NonZero) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startOneShot(10.0, BLINK_FROM_HERE);
 
   double runTime;
-  EXPECT_TRUE(timeTillNextDelayedTask(&runTime));
-  EXPECT_FLOAT_EQ(10.0, runTime);
-
-  m_platform.runUntilIdle();
+  EXPECT_TRUE(timeTillNextDelayedTask(platform, &runTime));
+  EXPECT_FLOAT_EQ(10.0, runTime);
+
+  platform->runUntilIdle();
   EXPECT_THAT(m_runTimes, ElementsAre(m_startTime + 10.0));
 }
 
 TEST_F(TimerTest, StartOneShot_NonZeroAndCancel) {
-  Timer<TimerTest> timer(this, &TimerTest::countingTask);
-  timer.startOneShot(10, BLINK_FROM_HERE);
-
-  double runTime;
-  EXPECT_TRUE(timeTillNextDelayedTask(&runTime));
-  EXPECT_FLOAT_EQ(10.0, runTime);
-
-  timer.stop();
-  EXPECT_TRUE(timeTillNextDelayedTask(&runTime));
-
-  m_platform.runUntilIdle();
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
+  Timer<TimerTest> timer(this, &TimerTest::countingTask);
+  timer.startOneShot(10, BLINK_FROM_HERE);
+
+  double runTime;
+  EXPECT_TRUE(timeTillNextDelayedTask(platform, &runTime));
+  EXPECT_FLOAT_EQ(10.0, runTime);
+
+  timer.stop();
+  EXPECT_TRUE(timeTillNextDelayedTask(platform, &runTime));
+
+  platform->runUntilIdle();
   EXPECT_FALSE(m_runTimes.size());
 }
 
 TEST_F(TimerTest, StartOneShot_NonZeroAndCancelThenRepost) {
-  Timer<TimerTest> timer(this, &TimerTest::countingTask);
-  timer.startOneShot(10, BLINK_FROM_HERE);
-
-  double runTime;
-  EXPECT_TRUE(timeTillNextDelayedTask(&runTime));
-  EXPECT_FLOAT_EQ(10.0, runTime);
-
-  timer.stop();
-  EXPECT_TRUE(timeTillNextDelayedTask(&runTime));
-
-  m_platform.runUntilIdle();
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
+  Timer<TimerTest> timer(this, &TimerTest::countingTask);
+  timer.startOneShot(10, BLINK_FROM_HERE);
+
+  double runTime;
+  EXPECT_TRUE(timeTillNextDelayedTask(platform, &runTime));
+  EXPECT_FLOAT_EQ(10.0, runTime);
+
+  timer.stop();
+  EXPECT_TRUE(timeTillNextDelayedTask(platform, &runTime));
+
+  platform->runUntilIdle();
   EXPECT_FALSE(m_runTimes.size());
 
   double secondPostTime = monotonicallyIncreasingTime();
   timer.startOneShot(10, BLINK_FROM_HERE);
 
-  EXPECT_TRUE(timeTillNextDelayedTask(&runTime));
-  EXPECT_FLOAT_EQ(10.0, runTime);
-
-  m_platform.runUntilIdle();
+  EXPECT_TRUE(timeTillNextDelayedTask(platform, &runTime));
+  EXPECT_FLOAT_EQ(10.0, runTime);
+
+  platform->runUntilIdle();
   EXPECT_THAT(m_runTimes, ElementsAre(secondPostTime + 10.0));
 }
 
 TEST_F(TimerTest, StartOneShot_NonZero_RepostingAfterRunning) {
-  Timer<TimerTest> timer(this, &TimerTest::countingTask);
-  timer.startOneShot(10, BLINK_FROM_HERE);
-
-  double runTime;
-  EXPECT_TRUE(timeTillNextDelayedTask(&runTime));
-  EXPECT_FLOAT_EQ(10.0, runTime);
-
-  m_platform.runUntilIdle();
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
+  Timer<TimerTest> timer(this, &TimerTest::countingTask);
+  timer.startOneShot(10, BLINK_FROM_HERE);
+
+  double runTime;
+  EXPECT_TRUE(timeTillNextDelayedTask(platform, &runTime));
+  EXPECT_FLOAT_EQ(10.0, runTime);
+
+  platform->runUntilIdle();
   EXPECT_THAT(m_runTimes, ElementsAre(m_startTime + 10.0));
 
   timer.startOneShot(20, BLINK_FROM_HERE);
 
-  EXPECT_TRUE(timeTillNextDelayedTask(&runTime));
+  EXPECT_TRUE(timeTillNextDelayedTask(platform, &runTime));
   EXPECT_FLOAT_EQ(20.0, runTime);
 
-  m_platform.runUntilIdle();
+  platform->runUntilIdle();
   EXPECT_THAT(m_runTimes, ElementsAre(m_startTime + 10.0, m_startTime + 30.0));
 }
 
 TEST_F(TimerTest, PostingTimerTwiceWithSameRunTimeDoesNothing) {
-  Timer<TimerTest> timer(this, &TimerTest::countingTask);
-  timer.startOneShot(10, BLINK_FROM_HERE);
-  timer.startOneShot(10, BLINK_FROM_HERE);
-
-  double runTime;
-  EXPECT_TRUE(timeTillNextDelayedTask(&runTime));
-  EXPECT_FLOAT_EQ(10.0, runTime);
-
-  m_platform.runUntilIdle();
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
+  Timer<TimerTest> timer(this, &TimerTest::countingTask);
+  timer.startOneShot(10, BLINK_FROM_HERE);
+  timer.startOneShot(10, BLINK_FROM_HERE);
+
+  double runTime;
+  EXPECT_TRUE(timeTillNextDelayedTask(platform, &runTime));
+  EXPECT_FLOAT_EQ(10.0, runTime);
+
+  platform->runUntilIdle();
   EXPECT_THAT(m_runTimes, ElementsAre(m_startTime + 10.0));
 }
 
 TEST_F(TimerTest, PostingTimerTwiceWithNewerRunTimeCancelsOriginalTask) {
-  Timer<TimerTest> timer(this, &TimerTest::countingTask);
-  timer.startOneShot(10, BLINK_FROM_HERE);
-  timer.startOneShot(0, BLINK_FROM_HERE);
-
-  m_platform.runUntilIdle();
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
+  Timer<TimerTest> timer(this, &TimerTest::countingTask);
+  timer.startOneShot(10, BLINK_FROM_HERE);
+  timer.startOneShot(0, BLINK_FROM_HERE);
+
+  platform->runUntilIdle();
   EXPECT_THAT(m_runTimes, ElementsAre(m_startTime + 0.0));
 }
 
 TEST_F(TimerTest, PostingTimerTwiceWithLaterRunTimeCancelsOriginalTask) {
-  Timer<TimerTest> timer(this, &TimerTest::countingTask);
-  timer.startOneShot(0, BLINK_FROM_HERE);
-  timer.startOneShot(10, BLINK_FROM_HERE);
-
-  m_platform.runUntilIdle();
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
+  Timer<TimerTest> timer(this, &TimerTest::countingTask);
+  timer.startOneShot(0, BLINK_FROM_HERE);
+  timer.startOneShot(10, BLINK_FROM_HERE);
+
+  platform->runUntilIdle();
   EXPECT_THAT(m_runTimes, ElementsAre(m_startTime + 10.0));
 }
 
 TEST_F(TimerTest, StartRepeatingTask) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startRepeating(1.0, BLINK_FROM_HERE);
 
   double runTime;
-  EXPECT_TRUE(timeTillNextDelayedTask(&runTime));
+  EXPECT_TRUE(timeTillNextDelayedTask(platform, &runTime));
   EXPECT_FLOAT_EQ(1.0, runTime);
 
-  runUntilDeadline(m_startTime + 5.5);
+  runUntilDeadline(platform, m_startTime + 5.5);
   EXPECT_THAT(m_runTimes, ElementsAre(m_startTime + 1.0, m_startTime + 2.0,
                                       m_startTime + 3.0, m_startTime + 4.0,
                                       m_startTime + 5.0));
 }
 
 TEST_F(TimerTest, StartRepeatingTask_ThenCancel) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startRepeating(1.0, BLINK_FROM_HERE);
 
   double runTime;
-  EXPECT_TRUE(timeTillNextDelayedTask(&runTime));
+  EXPECT_TRUE(timeTillNextDelayedTask(platform, &runTime));
   EXPECT_FLOAT_EQ(1.0, runTime);
 
-  runUntilDeadline(m_startTime + 2.5);
+  runUntilDeadline(platform, m_startTime + 2.5);
   EXPECT_THAT(m_runTimes, ElementsAre(m_startTime + 1.0, m_startTime + 2.0));
 
   timer.stop();
-  m_platform.runUntilIdle();
+  platform->runUntilIdle();
 
   EXPECT_THAT(m_runTimes, ElementsAre(m_startTime + 1.0, m_startTime + 2.0));
 }
 
 TEST_F(TimerTest, StartRepeatingTask_ThenPostOneShot) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startRepeating(1.0, BLINK_FROM_HERE);
 
   double runTime;
-  EXPECT_TRUE(timeTillNextDelayedTask(&runTime));
+  EXPECT_TRUE(timeTillNextDelayedTask(platform, &runTime));
   EXPECT_FLOAT_EQ(1.0, runTime);
 
-  runUntilDeadline(m_startTime + 2.5);
+  runUntilDeadline(platform, m_startTime + 2.5);
   EXPECT_THAT(m_runTimes, ElementsAre(m_startTime + 1.0, m_startTime + 2.0));
 
   timer.startOneShot(0, BLINK_FROM_HERE);
-  m_platform.runUntilIdle();
+  platform->runUntilIdle();
 
   EXPECT_THAT(m_runTimes, ElementsAre(m_startTime + 1.0, m_startTime + 2.0,
                                       m_startTime + 2.5));
 }
 
 TEST_F(TimerTest, IsActive_NeverPosted) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
 
   EXPECT_FALSE(timer.isActive());
 }
 
 TEST_F(TimerTest, IsActive_AfterPosting_OneShotZero) {
-  Timer<TimerTest> timer(this, &TimerTest::countingTask);
-  timer.startOneShot(0, BLINK_FROM_HERE);
-
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
+  Timer<TimerTest> timer(this, &TimerTest::countingTask);
+  timer.startOneShot(0, BLINK_FROM_HERE);
+
   EXPECT_TRUE(timer.isActive());
 }
 
 TEST_F(TimerTest, IsActive_AfterPosting_OneShotNonZero) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startOneShot(10, BLINK_FROM_HERE);
 
   EXPECT_TRUE(timer.isActive());
 }
 
 TEST_F(TimerTest, IsActive_AfterPosting_Repeating) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startRepeating(1.0, BLINK_FROM_HERE);
 
   EXPECT_TRUE(timer.isActive());
 }
 
 TEST_F(TimerTest, IsActive_AfterRunning_OneShotZero) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startOneShot(0, BLINK_FROM_HERE);
 
-  m_platform.runUntilIdle();
+  platform->runUntilIdle();
   EXPECT_FALSE(timer.isActive());
 }
 
 TEST_F(TimerTest, IsActive_AfterRunning_OneShotNonZero) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startOneShot(10, BLINK_FROM_HERE);
 
-  m_platform.runUntilIdle();
+  platform->runUntilIdle();
   EXPECT_FALSE(timer.isActive());
 }
 
 TEST_F(TimerTest, IsActive_AfterRunning_Repeating) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startRepeating(1.0, BLINK_FROM_HERE);
 
-  runUntilDeadline(m_startTime + 10);
+  runUntilDeadline(platform, m_startTime + 10);
   EXPECT_TRUE(timer.isActive());  // It should run until cancelled.
 }
 
 TEST_F(TimerTest, NextFireInterval_OneShotZero) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startOneShot(0, BLINK_FROM_HERE);
 
   EXPECT_FLOAT_EQ(0.0, timer.nextFireInterval());
 }
 
 TEST_F(TimerTest, NextFireInterval_OneShotNonZero) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startOneShot(10, BLINK_FROM_HERE);
 
   EXPECT_FLOAT_EQ(10.0, timer.nextFireInterval());
 }
 
 TEST_F(TimerTest, NextFireInterval_OneShotNonZero_AfterAFewSeconds) {
-  m_platform.setAutoAdvanceNowToPendingTasks(false);
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
+  platform->setAutoAdvanceNowToPendingTasks(false);
 
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startOneShot(10, BLINK_FROM_HERE);
 
-  m_platform.advanceClockSeconds(2.0);
+  platform->advanceClockSeconds(2.0);
   EXPECT_FLOAT_EQ(8.0, timer.nextFireInterval());
 }
 
 TEST_F(TimerTest, NextFireInterval_Repeating) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startRepeating(20, BLINK_FROM_HERE);
 
   EXPECT_FLOAT_EQ(20.0, timer.nextFireInterval());
 }
 
 TEST_F(TimerTest, RepeatInterval_NeverStarted) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
 
   EXPECT_FLOAT_EQ(0.0, timer.repeatInterval());
 }
 
 TEST_F(TimerTest, RepeatInterval_OneShotZero) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startOneShot(0, BLINK_FROM_HERE);
 
   EXPECT_FLOAT_EQ(0.0, timer.repeatInterval());
 }
 
 TEST_F(TimerTest, RepeatInterval_OneShotNonZero) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startOneShot(10, BLINK_FROM_HERE);
 
   EXPECT_FLOAT_EQ(0.0, timer.repeatInterval());
 }
 
 TEST_F(TimerTest, RepeatInterval_Repeating) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startRepeating(20, BLINK_FROM_HERE);
 
   EXPECT_FLOAT_EQ(20.0, timer.repeatInterval());
 }
 
 TEST_F(TimerTest, AugmentRepeatInterval) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startRepeating(10, BLINK_FROM_HERE);
   EXPECT_FLOAT_EQ(10.0, timer.repeatInterval());
   EXPECT_FLOAT_EQ(10.0, timer.nextFireInterval());
 
-  m_platform.advanceClockSeconds(2.0);
+  platform->advanceClockSeconds(2.0);
   timer.augmentRepeatInterval(10);
 
   EXPECT_FLOAT_EQ(20.0, timer.repeatInterval());
   EXPECT_FLOAT_EQ(18.0, timer.nextFireInterval());
 
   // NOTE setAutoAdvanceNowToPendingTasks(true) (which uses
   // cc::OrderedSimpleTaskRunner) results in somewhat strange behavior of the
   // test clock which breaks this test.  Specifically the test clock advancing
   // logic ignores newly posted delayed tasks and advances too far.
-  runUntilDeadline(m_startTime + 50.0);
+  runUntilDeadline(platform, m_startTime + 50.0);
   EXPECT_THAT(m_runTimes, ElementsAre(m_startTime + 20.0, m_startTime + 40.0));
 }
 
 TEST_F(TimerTest, AugmentRepeatInterval_TimerFireDelayed) {
-  m_platform.setAutoAdvanceNowToPendingTasks(false);
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
+  platform->setAutoAdvanceNowToPendingTasks(false);
 
   Timer<TimerTest> timer(this, &TimerTest::countingTask);
   timer.startRepeating(10, BLINK_FROM_HERE);
   EXPECT_FLOAT_EQ(10.0, timer.repeatInterval());
   EXPECT_FLOAT_EQ(10.0, timer.nextFireInterval());
 
-  m_platform.advanceClockSeconds(123.0);  // Make the timer long overdue.
+  platform->advanceClockSeconds(123.0);  // Make the timer long overdue.
   timer.augmentRepeatInterval(10);
 
   EXPECT_FLOAT_EQ(20.0, timer.repeatInterval());
   // The timer is overdue so it should be scheduled to fire immediatly.
   EXPECT_FLOAT_EQ(0.0, timer.nextFireInterval());
 }
 
 TEST_F(TimerTest, RepeatingTimerDoesNotDrift) {
-  m_platform.setAutoAdvanceNowToPendingTasks(false);
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
+  platform->setAutoAdvanceNowToPendingTasks(false);
 
   Timer<TimerTest> timer(this, &TimerTest::recordNextFireTimeTask);
   timer.startRepeating(2.0, BLINK_FROM_HERE);
 
   recordNextFireTimeTask(
       &timer);  // Next scheduled task to run at m_startTime + 2.0
 
   // Simulate timer firing early. Next scheduled task to run at
   // m_startTime + 4.0
-  m_platform.advanceClockSeconds(1.9);
-  runUntilDeadline(monotonicallyIncreasingTime() + 0.2);
+  platform->advanceClockSeconds(1.9);
+  runUntilDeadline(platform, monotonicallyIncreasingTime() + 0.2);
 
   // Next scheduled task to run at m_startTime + 6.0
-  m_platform.runForPeriodSeconds(2.0);
+  platform->runForPeriodSeconds(2.0);
   // Next scheduled task to run at m_startTime + 8.0
-  m_platform.runForPeriodSeconds(2.1);
+  platform->runForPeriodSeconds(2.1);
   // Next scheduled task to run at m_startTime + 10.0
-  m_platform.runForPeriodSeconds(2.9);
+  platform->runForPeriodSeconds(2.9);
   // Next scheduled task to run at m_startTime + 14.0 (skips a beat)
-  m_platform.advanceClockSeconds(3.1);
-  m_platform.runUntilIdle();
+  platform->advanceClockSeconds(3.1);
+  platform->runUntilIdle();
   // Next scheduled task to run at m_startTime + 18.0 (skips a beat)
-  m_platform.advanceClockSeconds(4.0);
-  m_platform.runUntilIdle();
+  platform->advanceClockSeconds(4.0);
+  platform->runUntilIdle();
   // Next scheduled task to run at m_startTime + 28.0 (skips 5 beats)
-  m_platform.advanceClockSeconds(10.0);
-  m_platform.runUntilIdle();
+  platform->advanceClockSeconds(10.0);
+  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> {
  public:
   using TimerFiredFunction =
       typename TaskRunnerTimer<TimerFiredClass>::TimerFiredFunction;
 
   ~TimerForTest() override {}
 
   TimerForTest(RefPtr<WebTaskRunner> webTaskRunner,
                TimerFiredClass* timerFiredClass,
                TimerFiredFunction timerFiredFunction)
       : TaskRunnerTimer<TimerFiredClass>(std::move(webTaskRunner),
                                          timerFiredClass,
                                          timerFiredFunction) {}
 };
 
 TEST_F(TimerTest, UserSuppliedWebTaskRunner) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   scoped_refptr<scheduler::TaskQueue> taskRunner(
-      m_platform.rendererScheduler()->NewTimerTaskRunner(
+      platform->rendererScheduler()->NewTimerTaskRunner(
           scheduler::TaskQueue::QueueType::TEST));
   RefPtr<scheduler::WebTaskRunnerImpl> webTaskRunner =
       scheduler::WebTaskRunnerImpl::create(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());
 }
 
 TEST_F(TimerTest, RunOnHeapTimer) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   RefPtr<OnHeapTimerOwner::Record> record = OnHeapTimerOwner::Record::create();
   Persistent<OnHeapTimerOwner> owner = new OnHeapTimerOwner(record);
 
   owner->startOneShot(0, BLINK_FROM_HERE);
 
   EXPECT_FALSE(record->timerHasFired());
-  m_platform.runUntilIdle();
+  platform->runUntilIdle();
   EXPECT_TRUE(record->timerHasFired());
 }
 
 TEST_F(TimerTest, DestructOnHeapTimer) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   RefPtr<OnHeapTimerOwner::Record> record = OnHeapTimerOwner::Record::create();
   Persistent<OnHeapTimerOwner> owner = new OnHeapTimerOwner(record);
 
   record->dispose();
   owner->startOneShot(0, BLINK_FROM_HERE);
 
   owner = nullptr;
   ThreadState::current()->collectGarbage(
       BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
   EXPECT_TRUE(record->ownerIsDestructed());
 
   EXPECT_FALSE(record->timerHasFired());
-  m_platform.runUntilIdle();
+  platform->runUntilIdle();
   EXPECT_FALSE(record->timerHasFired());
 }
 
 TEST_F(TimerTest, MarkOnHeapTimerAsUnreachable) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   RefPtr<OnHeapTimerOwner::Record> record = OnHeapTimerOwner::Record::create();
   Persistent<OnHeapTimerOwner> owner = new OnHeapTimerOwner(record);
 
   record->dispose();
   owner->startOneShot(0, BLINK_FROM_HERE);
 
   owner = nullptr;
   ThreadState::current()->collectGarbage(BlinkGC::NoHeapPointersOnStack,
                                          BlinkGC::GCWithoutSweep,
                                          BlinkGC::ForcedGC);
   EXPECT_FALSE(record->ownerIsDestructed());
 
   {
     GCForbiddenScope scope;
     EXPECT_FALSE(record->timerHasFired());
-    m_platform.runUntilIdle();
+    platform->runUntilIdle();
     EXPECT_FALSE(record->timerHasFired());
     EXPECT_FALSE(record->ownerIsDestructed());
   }
 }
 
 namespace {
 
 class TaskObserver : public base::MessageLoop::TaskObserver {
  public:
   TaskObserver(RefPtr<WebTaskRunner> task_runner,
                std::vector<RefPtr<WebTaskRunner>>* runOrder)
       : m_taskRunner(std::move(task_runner)), m_runOrder(runOrder) {}
 
   void WillProcessTask(const base::PendingTask&) {}
 
   void DidProcessTask(const base::PendingTask&) {
     m_runOrder->push_back(m_taskRunner);
   }
 
  private:
   RefPtr<WebTaskRunner> m_taskRunner;
   std::vector<RefPtr<WebTaskRunner>>* m_runOrder;
 };
 
 }  // namespace
 
 TEST_F(TimerTest, MoveToNewTaskRunnerOneShot) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   std::vector<RefPtr<WebTaskRunner>> runOrder;
 
   scoped_refptr<scheduler::TaskQueue> taskRunner1(
-      m_platform.rendererScheduler()->NewTimerTaskRunner(
+      platform->rendererScheduler()->NewTimerTaskRunner(
           scheduler::TaskQueue::QueueType::TEST));
   RefPtr<scheduler::WebTaskRunnerImpl> webTaskRunner1 =
       scheduler::WebTaskRunnerImpl::create(taskRunner1);
   TaskObserver taskObserver1(webTaskRunner1, &runOrder);
   taskRunner1->AddTaskObserver(&taskObserver1);
 
   scoped_refptr<scheduler::TaskQueue> taskRunner2(
-      m_platform.rendererScheduler()->NewTimerTaskRunner(
+      platform->rendererScheduler()->NewTimerTaskRunner(
           scheduler::TaskQueue::QueueType::TEST));
   RefPtr<scheduler::WebTaskRunnerImpl> webTaskRunner2 =
       scheduler::WebTaskRunnerImpl::create(taskRunner2);
   TaskObserver taskObserver2(webTaskRunner2, &runOrder);
   taskRunner2->AddTaskObserver(&taskObserver2);
 
   TimerForTest<TimerTest> timer(webTaskRunner1, this, &TimerTest::countingTask);
 
   double startTime = monotonicallyIncreasingTime();
 
   timer.startOneShot(1, BLINK_FROM_HERE);
 
-  m_platform.runForPeriodSeconds(0.5);
+  platform->runForPeriodSeconds(0.5);
 
   timer.moveToNewTaskRunner(webTaskRunner2);
 
-  m_platform.runUntilIdle();
+  platform->runUntilIdle();
 
   EXPECT_THAT(m_runTimes, ElementsAre(startTime + 1.0));
 
   EXPECT_THAT(runOrder, ElementsAre(webTaskRunner2));
 
   EXPECT_TRUE(taskRunner1->IsEmpty());
   EXPECT_TRUE(taskRunner2->IsEmpty());
 }
 
 TEST_F(TimerTest, MoveToNewTaskRunnerRepeating) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   std::vector<RefPtr<WebTaskRunner>> runOrder;
 
   scoped_refptr<scheduler::TaskQueue> taskRunner1(
-      m_platform.rendererScheduler()->NewTimerTaskRunner(
+      platform->rendererScheduler()->NewTimerTaskRunner(
           scheduler::TaskQueue::QueueType::TEST));
   RefPtr<scheduler::WebTaskRunnerImpl> webTaskRunner1 =
       scheduler::WebTaskRunnerImpl::create(taskRunner1);
   TaskObserver taskObserver1(webTaskRunner1, &runOrder);
   taskRunner1->AddTaskObserver(&taskObserver1);
 
   scoped_refptr<scheduler::TaskQueue> taskRunner2(
-      m_platform.rendererScheduler()->NewTimerTaskRunner(
+      platform->rendererScheduler()->NewTimerTaskRunner(
           scheduler::TaskQueue::QueueType::TEST));
   RefPtr<scheduler::WebTaskRunnerImpl> webTaskRunner2 =
       scheduler::WebTaskRunnerImpl::create(taskRunner2);
   TaskObserver taskObserver2(webTaskRunner2, &runOrder);
   taskRunner2->AddTaskObserver(&taskObserver2);
 
   TimerForTest<TimerTest> timer(webTaskRunner1, this, &TimerTest::countingTask);
 
   double startTime = monotonicallyIncreasingTime();
 
   timer.startRepeating(1, BLINK_FROM_HERE);
 
-  m_platform.runForPeriodSeconds(2.5);
+  platform->runForPeriodSeconds(2.5);
 
   timer.moveToNewTaskRunner(webTaskRunner2);
 
-  m_platform.runForPeriodSeconds(2);
+  platform->runForPeriodSeconds(2);
 
   EXPECT_THAT(m_runTimes, ElementsAre(startTime + 1.0, startTime + 2.0,
                                       startTime + 3.0, startTime + 4.0));
 
   EXPECT_THAT(runOrder, ElementsAre(webTaskRunner1, webTaskRunner1,
                                     webTaskRunner2, webTaskRunner2));
 
   EXPECT_TRUE(taskRunner1->IsEmpty());
   EXPECT_FALSE(taskRunner2->IsEmpty());
 }
 
 // This test checks that when inactive timer is moved to a different task
 // runner it isn't activated.
 TEST_F(TimerTest, MoveToNewTaskRunnerWithoutTasks) {
+  ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+      platform;
+  setupTimes(platform);
+
   scoped_refptr<scheduler::TaskQueue> taskRunner1(
-      m_platform.rendererScheduler()->NewTimerTaskRunner(
+      platform->rendererScheduler()->NewTimerTaskRunner(
           scheduler::TaskQueue::QueueType::TEST));
   RefPtr<scheduler::WebTaskRunnerImpl> webTaskRunner1 =
       scheduler::WebTaskRunnerImpl::create(taskRunner1);
 
   scoped_refptr<scheduler::TaskQueue> taskRunner2(
-      m_platform.rendererScheduler()->NewTimerTaskRunner(
+      platform->rendererScheduler()->NewTimerTaskRunner(
           scheduler::TaskQueue::QueueType::TEST));
   RefPtr<scheduler::WebTaskRunnerImpl> webTaskRunner2 =
       scheduler::WebTaskRunnerImpl::create(taskRunner2);
 
   TimerForTest<TimerTest> timer(webTaskRunner1, this, &TimerTest::countingTask);
 
-  m_platform.runUntilIdle();
+  platform->runUntilIdle();
   EXPECT_TRUE(!m_runTimes.size());
   EXPECT_TRUE(taskRunner1->IsEmpty());
   EXPECT_TRUE(taskRunner2->IsEmpty());
 }
 
 }  // namespace
 }  // namespace blink