Template methods on Timer classes instead of the classes themselves.

ui/gfx/screen_mac.mm

Index: ui/gfx/screen_mac.mm
diff --git a/ui/gfx/screen_mac.mm b/ui/gfx/screen_mac.mm
index 3039124e3384ca29f2e1b3ab7f30447304190616..abd8549dd86b1eaac369a0b687fac50cdc00546a 100644
--- a/ui/gfx/screen_mac.mm
+++ b/ui/gfx/screen_mac.mm
@@ -192,7 +192,7 @@ class ScreenMac : public gfx::Screen {
       return;
     }
 
-    configure_timer_.reset(new base::OneShotTimer<ScreenMac>());
+    configure_timer_.reset(new base::OneShotTimer());
     configure_timer_->Start(
         FROM_HERE,
         base::TimeDelta::FromMilliseconds(kConfigureDelayMs),
@@ -262,7 +262,7 @@ class ScreenMac : public gfx::Screen {
 
   // The timer to delay configuring outputs. See also the comments in
   // HandleDisplayReconfiguration().
-  scoped_ptr<base::OneShotTimer<ScreenMac> > configure_timer_;
+  scoped_ptr<base::OneShotTimer> configure_timer_;
 
   gfx::DisplayChangeNotifier change_notifier_;