Template methods on Timer classes instead of the classes themselves.

ash/display/display_configurator_animation.cc

 // 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.
 
 #include "ash/display/display_configurator_animation.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
@@ skipping 121 matching lines @@
         kFadingAnimationDurationInMS));
     observer->AddNewAnimator(hiding_layer->GetAnimator());
     hiding_layer->SetOpacity(1.0f);
     hiding_layer->SetVisible(true);
     hiding_layers_[root_window] = hiding_layer;
   }
 
   // In case that OnDisplayModeChanged() isn't called or its animator is
   // canceled due to some unknown errors, we set a timer to clear these
   // hiding layers.
-  timer_.reset(new base::OneShotTimer<DisplayConfiguratorAnimation>());
+  timer_.reset(new base::OneShotTimer());
   timer_->Start(FROM_HERE,
                 base::TimeDelta::FromSeconds(kFadingTimeoutDurationInSeconds),
                 this,
                 &DisplayConfiguratorAnimation::ClearHidingLayers);
 }
 
 void DisplayConfiguratorAnimation::StartFadeInAnimation() {
   // We want to make sure clearing all of hiding layers after the animation
   // finished.  Note that this callback can be canceled, but the cancel only
   // happens when the next animation is scheduled.  Thus the hiding layers
@@ skipping 65 matching lines @@
   if (timer_) {
     timer_->Stop();
     timer_.reset();
   }
   STLDeleteContainerPairSecondPointers(
       hiding_layers_.begin(), hiding_layers_.end());
   hiding_layers_.clear();
 }
 
 }  // namespace ash