Template methods on Timer classes instead of the classes themselves.

chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
 
 #include <string>
 
 #include "ash/shell.h"
 #include "ash/test/test_shell_delegate.h"
@@ skipping 116 matching lines @@
 
   AutomaticRebootManager* automatic_reboot_manger_;
 
   DISALLOW_COPY_AND_ASSIGN(MockAutomaticRebootManagerObserver);
 };
 
 }  // namespace
 
 class AutomaticRebootManagerBasicTest : public testing::Test {
  protected:
-  typedef base::OneShotTimer<AutomaticRebootManager> Timer;

[danakj, 2015/09/22 00:49:27]

I removed this typedef and made "Timer" into actual OneShotTimers below.

-
   AutomaticRebootManagerBasicTest();
   ~AutomaticRebootManagerBasicTest() override;
 
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
 
   void SetUpdateRebootNeededUptime(const base::TimeDelta& uptime);
   void SetRebootAfterUpdate(bool reboot_after_update, bool expect_reboot);
   void SetUptimeLimit(const base::TimeDelta& limit, bool expect_reboot);
@@ skipping 34 matching lines @@
   base::TimeDelta uptime_processing_delay_;
   base::TimeDelta update_reboot_needed_uptime_;
   base::TimeDelta uptime_limit_;
 
   scoped_refptr<TestAutomaticRebootManagerTaskRunner> task_runner_;
 
   MockAutomaticRebootManagerObserver automatic_reboot_manager_observer_;
   scoped_ptr<AutomaticRebootManager> automatic_reboot_manager_;
 
  private:
-  void VerifyTimerIsStopped(const Timer* timer) const;
-  void VerifyTimerIsRunning(const Timer* timer,
+  void VerifyTimerIsStopped(const base::OneShotTimer* timer) const;
+  void VerifyTimerIsRunning(const base::OneShotTimer* timer,
                             const base::TimeDelta& delay) const;
   void VerifyLoginScreenIdleTimerIsRunning() const;
 
   base::ScopedTempDir temp_dir_;
   base::FilePath update_reboot_needed_uptime_file_;
 
   bool reboot_after_update_;
 
   base::ThreadTaskRunnerHandle ui_thread_task_runner_handle_;
 
@@ skipping 330 matching lines @@
   }
 }
 
 void AutomaticRebootManagerBasicTest::SetUpdateStatusNeedReboot() {
   UpdateEngineClient::Status client_status;
   client_status.status = UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT;
   update_engine_client_->set_default_status(client_status);
 }
 
 void AutomaticRebootManagerBasicTest::VerifyTimerIsStopped(
-    const Timer* timer) const {
+    const base::OneShotTimer* timer) const {
   if (timer)
     EXPECT_FALSE(timer->IsRunning());
 }
 
 void AutomaticRebootManagerBasicTest::VerifyTimerIsRunning(
-    const Timer* timer,
+    const base::OneShotTimer* timer,
     const base::TimeDelta& delay) const {
   ASSERT_TRUE(timer);
   EXPECT_TRUE(timer->IsRunning());
   EXPECT_EQ(delay.ToInternalValue(),
             timer->GetCurrentDelay().ToInternalValue());
 }
 
 void AutomaticRebootManagerBasicTest::
     VerifyLoginScreenIdleTimerIsRunning() const {
   VerifyTimerIsRunning(
@@ skipping 1719 matching lines @@
 INSTANTIATE_TEST_CASE_P(
     AutomaticRebootManagerTestInstance,
     AutomaticRebootManagerTest,
     ::testing::Values(
         AUTOMATIC_REBOOT_MANAGER_TEST_SCENARIO_LOGIN_SCREEN,
         AUTOMATIC_REBOOT_MANAGER_TEST_SCENARIO_KIOSK_APP_SESSION,
         AUTOMATIC_REBOOT_MANAGER_TEST_SCENARIO_NON_KIOSK_APP_SESSION));
 
 }  // namespace system
 }  // namespace chromeos