From 0280cb6ec0c9158a01e2f484a6caa83d690b4e66 Mon Sep 17 00:00:00 2001 From: dcheng Date: Thu, 15 Jan 2015 23:37:50 -0800 Subject: Update {virtual,override,final} to follow C++11 style in chromeos/dbus. The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override. This patch was automatically generated with a ChromeOS build using a variation of https://codereview.chromium.org/598073004. BUG=417463 R=hashimoto@chromium.org Review URL: https://codereview.chromium.org/817853005 Cr-Commit-Position: refs/heads/master@{#311851} --- chromeos/dbus/power_policy_controller_unittest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chromeos/dbus/power_policy_controller_unittest.cc') diff --git a/chromeos/dbus/power_policy_controller_unittest.cc b/chromeos/dbus/power_policy_controller_unittest.cc index 8c35f3c..3d05c0b 100644 --- a/chromeos/dbus/power_policy_controller_unittest.cc +++ b/chromeos/dbus/power_policy_controller_unittest.cc @@ -16,15 +16,15 @@ class PowerPolicyControllerTest : public testing::Test { PowerPolicyControllerTest() : fake_power_client_(new FakePowerManagerClient) {} - virtual ~PowerPolicyControllerTest() {} + ~PowerPolicyControllerTest() override {} - virtual void SetUp() override { + void SetUp() override { PowerPolicyController::Initialize(fake_power_client_.get()); ASSERT_TRUE(PowerPolicyController::IsInitialized()); policy_controller_ = PowerPolicyController::Get(); } - virtual void TearDown() override { + void TearDown() override { if (PowerPolicyController::IsInitialized()) PowerPolicyController::Shutdown(); } -- cgit v1.1