From 5c1d060ed293f8c882e1ba82c1c10c743167d0b5 Mon Sep 17 00:00:00 2001 From: nick Date: Wed, 22 Apr 2015 21:43:32 -0700 Subject: Update {virtual,override} to follow C++11 style in chrome_elf. 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 manually generated using a regex and a text editor. BUG=417463 Review URL: https://codereview.chromium.org/1106533003 Cr-Commit-Position: refs/heads/master@{#326454} --- chrome_elf/chrome_elf_util_unittest.cc | 2 +- chrome_elf/create_file/chrome_create_file_unittest.cc | 2 +- chrome_elf/ntdll_cache_unittest.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome_elf') diff --git a/chrome_elf/chrome_elf_util_unittest.cc b/chrome_elf/chrome_elf_util_unittest.cc index 90b04ed..ad83801 100644 --- a/chrome_elf/chrome_elf_util_unittest.cc +++ b/chrome_elf/chrome_elf_util_unittest.cc @@ -57,7 +57,7 @@ class ChromeElfUtilTest : const char*, const char*> > { protected: - virtual void SetUp() override { + void SetUp() override { override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE); override_manager_.OverrideRegistry(HKEY_CURRENT_USER); const char* app; diff --git a/chrome_elf/create_file/chrome_create_file_unittest.cc b/chrome_elf/create_file/chrome_create_file_unittest.cc index cd66d47..8b0331f 100644 --- a/chrome_elf/create_file/chrome_create_file_unittest.cc +++ b/chrome_elf/create_file/chrome_create_file_unittest.cc @@ -76,7 +76,7 @@ class ChromeCreateFileTest : public PlatformTest { path); } - virtual void SetUp() override { + void SetUp() override { original_thread_ = base::PlatformThread::CurrentId(); InitCache(); PlatformTest::SetUp(); diff --git a/chrome_elf/ntdll_cache_unittest.cc b/chrome_elf/ntdll_cache_unittest.cc index a96df61..d3f3555a 100644 --- a/chrome_elf/ntdll_cache_unittest.cc +++ b/chrome_elf/ntdll_cache_unittest.cc @@ -13,7 +13,7 @@ namespace { class NTDLLCacheTest : public testing::Test { protected: - virtual void SetUp() override { + void SetUp() override { InitCache(); } -- cgit v1.1