Refactor Timer classes in preparation for landing FrameTimers.

third_party/WebKit/Source/core/svg/graphics/SVGImageTest.cpp

 // Copyright 2016 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 "core/svg/graphics/SVGImage.h"
 
 #include "core/svg/graphics/SVGImageChromeClient.h"
 #include "platform/SharedBuffer.h"
 #include "platform/Timer.h"
 #include "platform/geometry/FloatRect.h"
@@ skipping 29 matching lines @@
     }
     bool runsTasksOnCurrentThread() override { return true; }
     std::unique_ptr<WebTaskRunner> clone() override { return nullptr; }
     double virtualTimeSeconds() const override { return 0.0; }
     double monotonicallyIncreasingVirtualTimeSeconds() const override { return m_time; }
 
     double m_time;
     Task* m_currentTask;
 };
 
-class MockTimer : public Timer<SVGImageChromeClient> {
-    typedef void (SVGImageChromeClient::*TimerFiredFunction)(Timer*);
+class MockTimer : public TaskRunnerTimer<SVGImageChromeClient> {
 public:
+    using TimerFiredFunction = typename TaskRunnerTimer<SVGImageChromeClient>::TimerFiredFunction;
+
     MockTimer(SVGImageChromeClient* o, TimerFiredFunction f)
-    : Timer<SVGImageChromeClient>(o, f, &m_taskRunner)
+        : TaskRunnerTimer(&m_taskRunner, o, f)
     {
     }
 
     void fire()
     {
-        this->Timer<SVGImageChromeClient>::fired();
+        fired();
         stop();
     }
 
     void setTime(double newTime)
     {
         m_taskRunner.setTime(newTime);
     }
 
 private:
     MockTaskRunner m_taskRunner;
@@ skipping 115 matching lines @@
     EXPECT_TRUE(chromeClient.isSuspended());
     EXPECT_FALSE(timer->isActive());
 
     // Simulate a draw. This should resume the animation again.
     pumpFrame();
     EXPECT_FALSE(chromeClient.isSuspended());
     EXPECT_TRUE(timer->isActive());
 }
 
 } // namespace blink