summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornick <nick@chromium.org>2015-04-22 21:43:32 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-23 04:44:48 +0000
commit5c1d060ed293f8c882e1ba82c1c10c743167d0b5 (patch)
tree6bdf4411667a251969e96bace852f621492d2192
parente81b3346126a4f586992ed502256eba5b43f1e19 (diff)
downloadchromium_src-5c1d060ed293f8c882e1ba82c1c10c743167d0b5.zip
chromium_src-5c1d060ed293f8c882e1ba82c1c10c743167d0b5.tar.gz
chromium_src-5c1d060ed293f8c882e1ba82c1c10c743167d0b5.tar.bz2
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}
-rw-r--r--chrome_elf/chrome_elf_util_unittest.cc2
-rw-r--r--chrome_elf/create_file/chrome_create_file_unittest.cc2
-rw-r--r--chrome_elf/ntdll_cache_unittest.cc2
3 files changed, 3 insertions, 3 deletions
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();
}