Template methods on Timer classes instead of the classes themselves.

chrome/browser/chromeos/login/screens/update_screen.cc

 // 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 "chrome/browser/chromeos/login/screens/update_screen.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
@@ skipping 575 matching lines @@
 void UpdateScreen::DelayErrorMessage() {
   if (error_message_timer_.IsRunning())
     return;
 
   state_ = STATE_ERROR;
   error_message_timer_.Start(
       FROM_HERE, base::TimeDelta::FromSeconds(kDelayErrorMessageSec), this,
       &UpdateScreen::ShowErrorMessage);
 }
 
-base::OneShotTimer<UpdateScreen>&
-UpdateScreen::GetErrorMessageTimerForTesting() {
+base::OneShotTimer& UpdateScreen::GetErrorMessageTimerForTesting() {
   return error_message_timer_;
 }
 
 void UpdateScreen::OnConnectRequested() {
   if (state_ == STATE_ERROR) {
     LOG(WARNING) << "Hiding error message since AP was reselected";
     StartUpdateCheck();
   }
 }
 
 }  // namespace chromeos