diff options
author | dcheng <dcheng@chromium.org> | 2014-12-22 14:40:24 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-22 22:41:02 +0000 |
commit | 520ae85e967f776f4134277cb14e487894421226 (patch) | |
tree | 509299de71fd5d8cba15fe5758a495fd86898524 /sync/syncable | |
parent | df1702e8aa43e3996d64c0988e48612a5fad4624 (diff) | |
download | chromium_src-520ae85e967f776f4134277cb14e487894421226.zip chromium_src-520ae85e967f776f4134277cb14e487894421226.tar.gz chromium_src-520ae85e967f776f4134277cb14e487894421226.tar.bz2 |
Standardize usage of virtual/override/final specifiers in sync/.
The Google C++ style guide states:
Explicitly annotate overrides of virtual functions or virtual
destructors with an override or (less frequently) final specifier.
Older (pre-C++11) code will use the virtual keyword as an inferior
alternative annotation. For clarity, use exactly one of override,
final, or virtual when declaring an override.
To better conform to these guidelines, the following constructs have
been rewritten:
- if a base class has a virtual destructor, then:
virtual ~Foo(); -> ~Foo() override;
- virtual void Foo() override; -> void Foo() override;
- virtual void Foo() override final; -> void Foo() final;
This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.
Several formatting edits by clang-format were manually reverted, due to
mangling of some of the more complicate IPC macros.
BUG=417463
Review URL: https://codereview.chromium.org/792343004
Cr-Commit-Position: refs/heads/master@{#309474}
Diffstat (limited to 'sync/syncable')
-rw-r--r-- | sync/syncable/deferred_on_disk_directory_backing_store_unittest.cc | 6 | ||||
-rw-r--r-- | sync/syncable/directory_backing_store_unittest.cc | 4 | ||||
-rw-r--r-- | sync/syncable/directory_unittest.h | 6 | ||||
-rw-r--r-- | sync/syncable/parent_child_index_unittest.cc | 2 | ||||
-rw-r--r-- | sync/syncable/syncable_unittest.cc | 12 |
5 files changed, 12 insertions, 18 deletions
diff --git a/sync/syncable/deferred_on_disk_directory_backing_store_unittest.cc b/sync/syncable/deferred_on_disk_directory_backing_store_unittest.cc index b58ccb7..fbba75e 100644 --- a/sync/syncable/deferred_on_disk_directory_backing_store_unittest.cc +++ b/sync/syncable/deferred_on_disk_directory_backing_store_unittest.cc @@ -20,14 +20,12 @@ static const base::FilePath::CharType kSyncDataFolderName[] = class DeferredOnDiskDirectoryBackingStoreTest : public testing::Test { protected: - virtual void SetUp() override { + void SetUp() override { CHECK(temp_dir_.CreateUniqueTempDir()); db_path_ = temp_dir_.path().Append(kSyncDataFolderName); } - virtual void TearDown() override { - STLDeleteValues(&handles_map_); - } + void TearDown() override { STLDeleteValues(&handles_map_); } base::ScopedTempDir temp_dir_; base::FilePath db_path_; diff --git a/sync/syncable/directory_backing_store_unittest.cc b/sync/syncable/directory_backing_store_unittest.cc index 9b92e56..8f679f1 100644 --- a/sync/syncable/directory_backing_store_unittest.cc +++ b/sync/syncable/directory_backing_store_unittest.cc @@ -32,9 +32,7 @@ SYNC_EXPORT_PRIVATE extern const int32 kCurrentDBVersion; class MigrationTest : public testing::TestWithParam<int> { public: - virtual void SetUp() { - ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); - } + void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); } protected: std::string GetUsername() { diff --git a/sync/syncable/directory_unittest.h b/sync/syncable/directory_unittest.h index 81e3888..e5427a8 100644 --- a/sync/syncable/directory_unittest.h +++ b/sync/syncable/directory_unittest.h @@ -35,10 +35,10 @@ class SyncableDirectoryTest : public testing::Test { static const char kDirectoryName[]; SyncableDirectoryTest(); - virtual ~SyncableDirectoryTest(); + ~SyncableDirectoryTest() override; - virtual void SetUp(); - virtual void TearDown(); + void SetUp() override; + void TearDown() override; // Destroys any currently opened directory, creates and opens a new one. // diff --git a/sync/syncable/parent_child_index_unittest.cc b/sync/syncable/parent_child_index_unittest.cc index 5ae9d27..c0c9e82 100644 --- a/sync/syncable/parent_child_index_unittest.cc +++ b/sync/syncable/parent_child_index_unittest.cc @@ -21,7 +21,7 @@ static const std::string kCacheGuid = "8HhNIHlEOCGQbIAALr9QEg=="; class ParentChildIndexTest : public testing::Test { public: - virtual void TearDown() { + void TearDown() override { // To make memory management easier, we take ownership of all EntryKernels // returned by our factory methods and delete them here. STLDeleteElements(&owned_entry_kernels_); diff --git a/sync/syncable/syncable_unittest.cc b/sync/syncable/syncable_unittest.cc index 5706106..d1c6ae8 100644 --- a/sync/syncable/syncable_unittest.cc +++ b/sync/syncable/syncable_unittest.cc @@ -146,7 +146,7 @@ class OnDiskSyncableDirectoryTest : public SyncableDirectoryTest { protected: // SetUp() is called before each test case is run. // The sqlite3 DB is deleted before each test is run. - virtual void SetUp() { + void SetUp() override { SyncableDirectoryTest::SetUp(); ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); file_path_ = temp_dir_.path().Append( @@ -155,7 +155,7 @@ class OnDiskSyncableDirectoryTest : public SyncableDirectoryTest { CreateDirectory(); } - virtual void TearDown() { + void TearDown() override { // This also closes file handles. dir()->SaveChanges(); dir().reset(); @@ -545,12 +545,10 @@ TEST_F(OnDiskSyncableDirectoryTest, TestSaveChangesFailureWithPurge) { class SyncableDirectoryManagement : public testing::Test { public: - virtual void SetUp() { - ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); - } + void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); } + + void TearDown() override {} - virtual void TearDown() { - } protected: base::MessageLoop message_loop_; base::ScopedTempDir temp_dir_; |