Refactor Timer classes in preparation for landing FrameTimers.

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/testing/TestingPlatformSupport.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebScheduler.h"
 #include "public/platform/WebThread.h"
@@ skipping 284 matching lines @@
 
 class TimerTest : public testing::Test {
 public:
     void SetUp() override
     {
         m_runTimes.clear();
         gCurrentTimeSecs = 10.0;
         m_startTime = gCurrentTimeSecs;
     }
 
-    void countingTask(Timer<TimerTest>*)
+    void countingTask(TimerBase*)
     {
         m_runTimes.append(gCurrentTimeSecs);
     }
 
-    void recordNextFireTimeTask(Timer<TimerTest>* timer)
+    void recordNextFireTimeTask(TimerBase* timer)
     {
         m_nextFireTimes.append(gCurrentTimeSecs + timer->nextFireInterval());
     }
 
     void advanceTimeBy(double timeSecs)
     {
         gCurrentTimeSecs += timeSecs;
     }
 
     void runUntilIdle()
@@ skipping 437 matching lines @@
         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 Timer<TimerFiredClass> {
+class TimerForTest : public TaskRunnerTimer<TimerFiredClass> {
 public:
-    using TimerFiredFunction = void (TimerFiredClass::*)(Timer<TimerFiredClass>*);
+    using TimerFiredFunction = typename TaskRunnerTimer<TimerFiredClass>::TimerFiredFunction;
 
     ~TimerForTest() override { }
 
-    TimerForTest(TimerFiredClass* timerFiredClass, TimerFiredFunction timerFiredFunction, WebTaskRunner* webTaskRunner)
-        : Timer<TimerFiredClass>(timerFiredClass, timerFiredFunction, webTaskRunner)
+    TimerForTest(WebTaskRunner* webTaskRunner, TimerFiredClass* timerFiredClass, TimerFiredFunction timerFiredFunction)
+        : TaskRunnerTimer<TimerFiredClass>(webTaskRunner, timerFiredClass, timerFiredFunction)
     {
     }
 };
 
 TEST_F(TimerTest, UserSuppliedWebTaskRunner)
 {
     std::priority_queue<DelayedTask> timerTasks;
     MockWebTaskRunner taskRunner(&timerTasks);
-    TimerForTest<TimerTest> timer(this, &TimerTest::countingTask, &taskRunner);
+    TimerForTest<TimerTest> timer(&taskRunner, this, &TimerTest::countingTask);
     timer.startOneShot(0, BLINK_FROM_HERE);
 
     // Make sure the task was posted on taskRunner.
     EXPECT_FALSE(timerTasks.empty());
 }
 
 
 } // namespace
 } // namespace blink