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/shill_manager_client_unittest.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'chromeos/dbus/shill_manager_client_unittest.cc') diff --git a/chromeos/dbus/shill_manager_client_unittest.cc b/chromeos/dbus/shill_manager_client_unittest.cc index 7f5a13e..c9eb1a8 100644 --- a/chromeos/dbus/shill_manager_client_unittest.cc +++ b/chromeos/dbus/shill_manager_client_unittest.cc @@ -56,7 +56,7 @@ class ShillManagerClientTest : public ShillClientUnittestBase { dbus::ObjectPath(shill::kFlimflamServicePath)) { } - virtual void SetUp() { + void SetUp() override { ShillClientUnittestBase::SetUp(); // Create a client with the mock bus. client_.reset(ShillManagerClient::Create()); @@ -65,9 +65,7 @@ class ShillManagerClientTest : public ShillClientUnittestBase { message_loop_.RunUntilIdle(); } - virtual void TearDown() { - ShillClientUnittestBase::TearDown(); - } + void TearDown() override { ShillClientUnittestBase::TearDown(); } protected: scoped_ptr client_; -- cgit v1.1