Refactor Timer classes in preparation for landing FrameTimers.

third_party/WebKit/Source/platform/Timer.cpp

Index: third_party/WebKit/Source/platform/Timer.cpp
diff --git a/third_party/WebKit/Source/platform/Timer.cpp b/third_party/WebKit/Source/platform/Timer.cpp
index 14ee907247ac45fc3ef7835e73de28cb590fddbc..c2eceac5988c9903d4cda0e42876220f46d905a1 100644
--- a/third_party/WebKit/Source/platform/Timer.cpp
+++ b/third_party/WebKit/Source/platform/Timer.cpp
@@ -40,8 +40,6 @@
 
 namespace blink {
 
-TimerBase::TimerBase() : TimerBase(Platform::current()->currentThread()->scheduler()->timerTaskRunner()) { }
-
 TimerBase::TimerBase(WebTaskRunner* webTaskRunner)
     : m_nextFireTime(0)
     , m_repeatInterval(0)
@@ -88,6 +86,18 @@ double TimerBase::nextFireInterval() const
     return m_nextFireTime - current;
 }
 
+// static
+WebTaskRunner* TimerBase::getTimerTaskRunner()
+{
+    return Platform::current()->currentThread()->scheduler()->timerTaskRunner();
+}
+
+// static
+WebTaskRunner* TimerBase::getUnthrottledTaskRunner()
+{
+    return Platform::current()->currentThread()->getWebTaskRunner();
+}
+
 WebTaskRunner* TimerBase::timerTaskRunner() const
 {
     return m_webTaskRunner;
@@ -143,11 +153,6 @@ bool TimerBase::Comparator::operator()(const TimerBase* a, const TimerBase* b) c
 }
 
 // static
-WebTaskRunner* TimerBase::UnthrottledWebTaskRunner()
-{
-    return Platform::current()->currentThread()->getWebTaskRunner();
-}
-
 double TimerBase::timerMonotonicallyIncreasingTime() const
 {
     return timerTaskRunner()->monotonicallyIncreasingVirtualTimeSeconds();