Refactor Timer classes in preparation for landing FrameTimers.

third_party/WebKit/Source/web/AssociatedURLLoader.cpp

Index: third_party/WebKit/Source/web/AssociatedURLLoader.cpp
diff --git a/third_party/WebKit/Source/web/AssociatedURLLoader.cpp b/third_party/WebKit/Source/web/AssociatedURLLoader.cpp
index 97b69707fc02072d521521949ae805fe8f7d8885..2e50987350d0ffc440ef530674f821475238ec7e 100644
--- a/third_party/WebKit/Source/web/AssociatedURLLoader.cpp
+++ b/third_party/WebKit/Source/web/AssociatedURLLoader.cpp
@@ -113,7 +113,7 @@ public:
 private:
     ClientAdapter(AssociatedURLLoader*, WebURLLoaderClient*, const WebURLLoaderOptions&);
 
-    void notifyError(Timer<ClientAdapter>*);
+    void notifyError(TimerBase*);
 
     AssociatedURLLoader* m_loader;
     WebURLLoaderClient* m_client;
@@ -258,7 +258,7 @@ void AssociatedURLLoader::ClientAdapter::enableErrorNotifications()
         m_errorTimer.startOneShot(0, BLINK_FROM_HERE);
 }
 
-void AssociatedURLLoader::ClientAdapter::notifyError(Timer<ClientAdapter>* timer)
+void AssociatedURLLoader::ClientAdapter::notifyError(TimerBase* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_errorTimer);