Template methods on Timer classes instead of the classes themselves.

ui/message_center/message_center_impl.h

Index: ui/message_center/message_center_impl.h
diff --git a/ui/message_center/message_center_impl.h b/ui/message_center/message_center_impl.h
index 883d371903fb86cc578fe9f71a4445818ba5618e..ccb4aed3b81c83bcf22251d9b160d99149d32994 100644
--- a/ui/message_center/message_center_impl.h
+++ b/ui/message_center/message_center_impl.h
@@ -70,7 +70,7 @@ class PopupTimer {
   base::WeakPtr<PopupTimersController> timer_controller_;
 
   // The actual timer.
-  scoped_ptr<base::OneShotTimer<PopupTimersController> > timer_;
+  scoped_ptr<base::OneShotTimer> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(PopupTimer);
 };
@@ -223,7 +223,7 @@ class MessageCenterImpl : public MessageCenter,
   NotificationCache notification_cache_;
   base::ObserverList<MessageCenterObserver> observer_list_;
   scoped_ptr<internal::PopupTimersController> popup_timers_controller_;
-  scoped_ptr<base::OneShotTimer<MessageCenterImpl> > quiet_mode_timer_;
+  scoped_ptr<base::OneShotTimer> quiet_mode_timer_;
   NotifierSettingsProvider* settings_provider_;
   std::vector<NotificationBlocker*> blockers_;