Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(712)

Unified Diff: chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc

Issue 1355063004: Template methods on Timer classes instead of the classes themselves. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: timer: fixcaller Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
index a6ac98325d0b748925f52d948bf755ea4faceba9..3fe61fbe8524ee115ce678e800c0416dd132f26e 100644
--- a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
+++ b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
@@ -134,8 +134,6 @@ class MockAutomaticRebootManagerObserver
class AutomaticRebootManagerBasicTest : public testing::Test {
protected:
- typedef base::OneShotTimer<AutomaticRebootManager> Timer;
-
AutomaticRebootManagerBasicTest();
~AutomaticRebootManagerBasicTest() override;
@@ -190,8 +188,8 @@ class AutomaticRebootManagerBasicTest : public testing::Test {
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;
@@ -542,13 +540,13 @@ void AutomaticRebootManagerBasicTest::SetUpdateStatusNeedReboot() {
}
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());

Powered by Google App Engine
This is Rietveld 408576698