Template methods on Timer classes instead of the classes themselves.

media/audio/audio_output_controller.cc

Index: media/audio/audio_output_controller.cc
diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc
index 8af0aabb24667fcd45b1cb81f1054e4283ea3f76..59f541e7ac3e530720d3cbac1c3c5372bbfe0149 100644
--- a/media/audio/audio_output_controller.cc
+++ b/media/audio/audio_output_controller.cc
@@ -176,7 +176,7 @@ void AudioOutputController::DoPlay() {
   // Timer self-manages its lifetime and WedgeCheck() will only record the UMA
   // statistic if state is still kPlaying.  Additional Start() calls will
   // invalidate the previous timer.
-  wedge_timer_.reset(new base::OneShotTimer<AudioOutputController>());
+  wedge_timer_.reset(new base::OneShotTimer());
   wedge_timer_->Start(
       FROM_HERE, TimeDelta::FromSeconds(5), this,
       &AudioOutputController::WedgeCheck);