Template methods on Timer classes instead of the classes themselves.

ui/message_center/popup_timer.h

 // Copyright (c) 2013 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.
 
 #ifndef UI_MESSAGE_CENTER_POPUP_TIMER_H_
 #define UI_MESSAGE_CENTER_POPUP_TIMER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 47 matching lines @@
   // If paused, the amount of time that passed before pause.
   base::TimeDelta passed_;
 
   // The time that the timer was last started.
   base::Time start_time_;
 
   // Callback recipient.
   base::WeakPtr<PopupTimersController> timer_controller_;
 
   // The actual timer.
-  scoped_ptr<base::OneShotTimer<PopupTimersController>> timer_;
+  scoped_ptr<base::OneShotTimer> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(PopupTimer);
 };
 
 // A class that manages all the timers running for individual notification popup
 // windows.  It supports weak pointers in order to allow safe callbacks when
 // timers expire.
 class MESSAGE_CENTER_EXPORT PopupTimersController
     : public base::SupportsWeakPtr<PopupTimersController>,
       public MessageCenterObserver {
@@ skipping 42 matching lines @@
   typedef base::ScopedPtrMap<std::string, scoped_ptr<PopupTimer>>
       PopupTimerCollection;
   PopupTimerCollection popup_timers_;
 
   DISALLOW_COPY_AND_ASSIGN(PopupTimersController);
 };
 
 }  // namespace message_center
 
 #endif  // UI_MESSAGE_CENTER_POPUP_TIMER_H_