Refactor Timer classes in preparation for landing FrameTimers.

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

Index: third_party/WebKit/Source/core/svg/graphics/SVGImageTest.cpp
diff --git a/third_party/WebKit/Source/core/svg/graphics/SVGImageTest.cpp b/third_party/WebKit/Source/core/svg/graphics/SVGImageTest.cpp
index 8e9fc134c752b472402b12dae52a0e4b1d77bfa9..caaf48c18b9fdd63bcc57447f17992f6e6adf551 100644
--- a/third_party/WebKit/Source/core/svg/graphics/SVGImageTest.cpp
+++ b/third_party/WebKit/Source/core/svg/graphics/SVGImageTest.cpp
@@ -47,17 +47,18 @@ private:
     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();
     }