Template methods on Timer classes instead of the classes themselves.

chrome/test/remoting/waiter.h

Index: chrome/test/remoting/waiter.h
diff --git a/chrome/test/remoting/waiter.h b/chrome/test/remoting/waiter.h
index 9201d77e70755a6c42e75647f0df174c85a2891f..ba5183d40877c1558d17a3ed0e057aafc2fcbc2d 100644
--- a/chrome/test/remoting/waiter.h
+++ b/chrome/test/remoting/waiter.h
@@ -33,7 +33,7 @@ class TimeoutWaiter {
   // Callback used to cancel the TimeoutWaiter::Wait.
   void CancelWaitCallback();
 
-  base::OneShotTimer<TimeoutWaiter> timeout_timer_;
+  base::OneShotTimer timeout_timer_;
   base::TimeDelta timeout_;
   scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
 
@@ -63,7 +63,7 @@ class ConditionalTimeoutWaiter : public TimeoutWaiter {
 
   base::TimeDelta interval_;
   Predicate callback_;
-  base::RepeatingTimer<ConditionalTimeoutWaiter> condition_timer_;
+  base::RepeatingTimer condition_timer_;
   bool success_;
 
   DISALLOW_COPY_AND_ASSIGN(ConditionalTimeoutWaiter);