Template methods on Timer classes instead of the classes themselves.

ash/display/display_configurator_animation.h

 // Copyright 2014 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_DISPLAY_DISPLAY_CONFIGURATOR_ANIMATION_H_
 #define ASH_DISPLAY_DISPLAY_CONFIGURATOR_ANIMATION_H_
 
 #include <map>
 
 #include "ash/ash_export.h"
@@ skipping 38 matching lines @@
       const ui::DisplayConfigurator::DisplayStateList& displays,
       ui::MultipleDisplayState failed_new_state) override;
 
  private:
   // Clears all hiding layers.  Note that in case that this method is called
   // during an animation, the method call will cancel all of the animations
   // and *not* call the registered callback.
   void ClearHidingLayers();
 
   std::map<aura::Window*, ui::Layer*> hiding_layers_;
-  scoped_ptr<base::OneShotTimer<DisplayConfiguratorAnimation> > timer_;
+  scoped_ptr<base::OneShotTimer> timer_;
   base::WeakPtrFactory<DisplayConfiguratorAnimation> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayConfiguratorAnimation);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_CONFIGURATION_CONTROLLER_H_