Template methods on Timer classes instead of the classes themselves.

ui/gfx/screen_mac.mm

 // Copyright (c) 2012 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.
 
 #include "ui/gfx/screen.h"
 
 #import <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 
 #include <map>
@@ skipping 174 matching lines @@
 
   void HandleDisplayReconfiguration() {
     // Given that we need to rebuild the list of displays, we want to coalesce
     // the events. For that, we use a timer that will be reset every time we get
     // a new event and will be fulfilled kConfigureDelayMs after the latest.
     if (configure_timer_.get() && configure_timer_->IsRunning()) {
       configure_timer_->Reset();
       return;
     }
 
-    configure_timer_.reset(new base::OneShotTimer<ScreenMac>());
+    configure_timer_.reset(new base::OneShotTimer());
     configure_timer_->Start(
         FROM_HERE,
         base::TimeDelta::FromMilliseconds(kConfigureDelayMs),
         this,
         &ScreenMac::ConfigureTimerFired);
   }
 
  private:
   void ConfigureTimerFired() {
     std::vector<gfx::Display> old_displays = displays_;
@@ skipping 49 matching lines @@
       return std::vector<gfx::Display>(1, GetPrimaryDisplay());
 
     return displays;
   }
 
   // The displays currently attached to the device.
   std::vector<gfx::Display> displays_;
 
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenMac);
 };
 
 }  // namespace
 
 namespace gfx {
 
 #if !defined(USE_AURA)
 Screen* CreateNativeScreen() {
   return new ScreenMac;
 }
 #endif
 
 }