Template methods on Timer classes instead of the classes themselves.

ash/wm/lock_state_controller.h

 // Copyright 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 ASH_WM_LOCK_STATE_CONTROLLER_H_
 #define ASH_WM_LOCK_STATE_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
 #include "ash/wm/lock_state_observer.h"
@@ skipping 294 matching lines @@
   // Indicates that lock animation can be undone.
   bool can_cancel_lock_animation_;
 
   scoped_ptr<UnlockedStateProperties> unlocked_properties_;
 
   // How long has it been since the request to lock the screen?
   scoped_ptr<base::ElapsedTimer> lock_duration_timer_;
 
   // Started when we request that the screen be locked.  When it fires, we
   // assume that our request got dropped.
-  base::OneShotTimer<LockStateController> lock_fail_timer_;
+  base::OneShotTimer lock_fail_timer_;
 
   // Started when the screen is locked while the power button is held.  Adds a
   // delay between the appearance of the lock screen and the beginning of the
   // pre-shutdown animation.
-  base::OneShotTimer<LockStateController> lock_to_shutdown_timer_;
+  base::OneShotTimer lock_to_shutdown_timer_;
 
   // Started when we begin displaying the pre-shutdown animation.  When it
   // fires, we start the shutdown animation and get ready to request shutdown.
-  base::OneShotTimer<LockStateController> pre_shutdown_timer_;
+  base::OneShotTimer pre_shutdown_timer_;
 
   // Started when we display the shutdown animation.  When it fires, we actually
   // request shutdown.  Gives the animation time to complete before Chrome, X,
   // etc. are shut down.
-  base::OneShotTimer<LockStateController> real_shutdown_timer_;
+  base::OneShotTimer real_shutdown_timer_;
 
   base::Closure lock_screen_displayed_callback_;
 
   base::WeakPtrFactory<LockStateController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LockStateController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_LOCK_STATE_CONTROLLER_H_