summaryrefslogtreecommitdiffstats
path: root/extensions/browser/value_store
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-27 14:43:14 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-27 21:43:44 +0000
commitf9afb370f94e325015aa8633135474f87aa5eb76 (patch)
tree4688f718dc5af753297b11f3e765c08e248a3098 /extensions/browser/value_store
parent1d5884e1c15b36604a9c9f9376d18cb91f345f47 (diff)
downloadchromium_src-f9afb370f94e325015aa8633135474f87aa5eb76.zip
chromium_src-f9afb370f94e325015aa8633135474f87aa5eb76.tar.gz
chromium_src-f9afb370f94e325015aa8633135474f87aa5eb76.tar.bz2
Standardize usage of virtual/override/final specifiers.
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. BUG=417463 R=jyasskin@chromium.org Review URL: https://codereview.chromium.org/685503002 Cr-Commit-Position: refs/heads/master@{#301450}
Diffstat (limited to 'extensions/browser/value_store')
-rw-r--r--extensions/browser/value_store/leveldb_value_store_unittest.cc6
-rw-r--r--extensions/browser/value_store/value_store_frontend_unittest.cc4
-rw-r--r--extensions/browser/value_store/value_store_unittest.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/extensions/browser/value_store/leveldb_value_store_unittest.cc b/extensions/browser/value_store/leveldb_value_store_unittest.cc
index a81f887..3c0fd53 100644
--- a/extensions/browser/value_store/leveldb_value_store_unittest.cc
+++ b/extensions/browser/value_store/leveldb_value_store_unittest.cc
@@ -32,16 +32,16 @@ INSTANTIATE_TEST_CASE_P(
class LeveldbValueStoreUnitTest : public testing::Test {
public:
LeveldbValueStoreUnitTest() {}
- virtual ~LeveldbValueStoreUnitTest() {}
+ ~LeveldbValueStoreUnitTest() override {}
protected:
- virtual void SetUp() override {
+ void SetUp() override {
ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
OpenStore();
ASSERT_FALSE(store_->Get()->HasError());
}
- virtual void TearDown() override {
+ void TearDown() override {
store_->Clear();
store_.reset();
}
diff --git a/extensions/browser/value_store/value_store_frontend_unittest.cc b/extensions/browser/value_store/value_store_frontend_unittest.cc
index 6622af9..c3e6f85 100644
--- a/extensions/browser/value_store/value_store_frontend_unittest.cc
+++ b/extensions/browser/value_store/value_store_frontend_unittest.cc
@@ -21,7 +21,7 @@ class ValueStoreFrontendTest : public testing::Test {
file_thread_(BrowserThread::FILE, base::MessageLoop::current()) {
}
- virtual void SetUp() {
+ void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
base::FilePath test_data_dir;
@@ -33,7 +33,7 @@ class ValueStoreFrontendTest : public testing::Test {
ResetStorage();
}
- virtual void TearDown() {
+ void TearDown() override {
base::MessageLoop::current()->RunUntilIdle(); // wait for storage to delete
storage_.reset();
}
diff --git a/extensions/browser/value_store/value_store_unittest.h b/extensions/browser/value_store/value_store_unittest.h
index 3571b35..f50e690 100644
--- a/extensions/browser/value_store/value_store_unittest.h
+++ b/extensions/browser/value_store/value_store_unittest.h
@@ -24,8 +24,8 @@ class ValueStoreTest : public testing::TestWithParam<ValueStoreTestParam> {
ValueStoreTest();
virtual ~ValueStoreTest();
- virtual void SetUp() override;
- virtual void TearDown() override;
+ void SetUp() override;
+ void TearDown() override;
protected:
scoped_ptr<ValueStore> storage_;