| 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 82744c5f06d42117ae45c7e5a24c4f4ff7d46d24..6a233763b911caef54753e66e7026bfb42abe8ea 100644
|
| --- a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
|
| +++ b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
|
| @@ -60,14 +60,14 @@ class MockTimeSingleThreadTaskRunner : public base::SingleThreadTaskRunner {
|
| MockTimeSingleThreadTaskRunner();
|
|
|
| // base::SingleThreadTaskRunner:
|
| - virtual bool RunsTasksOnCurrentThread() const OVERRIDE;
|
| + virtual bool RunsTasksOnCurrentThread() const override;
|
| virtual bool PostDelayedTask(const tracked_objects::Location& from_here,
|
| const base::Closure& task,
|
| - base::TimeDelta delay) OVERRIDE;
|
| + base::TimeDelta delay) override;
|
| virtual bool PostNonNestableDelayedTask(
|
| const tracked_objects::Location& from_here,
|
| const base::Closure& task,
|
| - base::TimeDelta delay) OVERRIDE;
|
| + base::TimeDelta delay) override;
|
|
|
| void SetUptimeFile(const base::FilePath& uptime_file);
|
| void SetUptime(const base::TimeDelta& uptime);
|
| @@ -107,7 +107,7 @@ class MockTimeTickClock : public base::TickClock {
|
| virtual ~MockTimeTickClock();
|
|
|
| // base::TickClock:
|
| - virtual base::TimeTicks NowTicks() OVERRIDE;
|
| + virtual base::TimeTicks NowTicks() override;
|
|
|
| private:
|
| scoped_refptr<MockTimeSingleThreadTaskRunner> task_runner_;
|
| @@ -125,8 +125,8 @@ class AutomaticRebootManagerBasicTest : public testing::Test {
|
| virtual ~AutomaticRebootManagerBasicTest();
|
|
|
| // testing::Test:
|
| - virtual void SetUp() OVERRIDE;
|
| - virtual void TearDown() OVERRIDE;
|
| + virtual void SetUp() override;
|
| + virtual void TearDown() override;
|
|
|
| void SetUpdateRebootNeededUptime(const base::TimeDelta& uptime);
|
| void SetRebootAfterUpdate(bool reboot_after_update, bool expect_reboot);
|
|
|