diff options
author | mostynb <mostynb@opera.com> | 2014-10-03 09:32:19 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-03 16:32:37 +0000 |
commit | 0eac4e1becc07e32503722d9ffd421cf8c8688e3 (patch) | |
tree | b8777ad781ca887318c7760bb7380fd662497558 /extensions/browser/value_store | |
parent | c0fd0633fb72a4e71acaf09f47202c8b8225a015 (diff) | |
download | chromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.zip chromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.tar.gz chromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.tar.bz2 |
replace OVERRIDE and FINAL with override and final in extensions/
BUG=417463
Review URL: https://codereview.chromium.org/622343002
Cr-Commit-Position: refs/heads/master@{#298042}
Diffstat (limited to 'extensions/browser/value_store')
4 files changed, 30 insertions, 30 deletions
diff --git a/extensions/browser/value_store/leveldb_value_store.h b/extensions/browser/value_store/leveldb_value_store.h index ec2a0e0..40e1fb6 100644 --- a/extensions/browser/value_store/leveldb_value_store.h +++ b/extensions/browser/value_store/leveldb_value_store.h @@ -30,23 +30,23 @@ class LeveldbValueStore : public ValueStore { virtual ~LeveldbValueStore(); // ValueStore implementation. - virtual size_t GetBytesInUse(const std::string& key) OVERRIDE; - virtual size_t GetBytesInUse(const std::vector<std::string>& keys) OVERRIDE; - virtual size_t GetBytesInUse() OVERRIDE; - virtual ReadResult Get(const std::string& key) OVERRIDE; - virtual ReadResult Get(const std::vector<std::string>& keys) OVERRIDE; - virtual ReadResult Get() OVERRIDE; + virtual size_t GetBytesInUse(const std::string& key) override; + virtual size_t GetBytesInUse(const std::vector<std::string>& keys) override; + virtual size_t GetBytesInUse() override; + virtual ReadResult Get(const std::string& key) override; + virtual ReadResult Get(const std::vector<std::string>& keys) override; + virtual ReadResult Get() override; virtual WriteResult Set( WriteOptions options, const std::string& key, - const base::Value& value) OVERRIDE; + const base::Value& value) override; virtual WriteResult Set( - WriteOptions options, const base::DictionaryValue& values) OVERRIDE; - virtual WriteResult Remove(const std::string& key) OVERRIDE; - virtual WriteResult Remove(const std::vector<std::string>& keys) OVERRIDE; - virtual WriteResult Clear() OVERRIDE; - virtual bool Restore() OVERRIDE; - virtual bool RestoreKey(const std::string& key) OVERRIDE; + WriteOptions options, const base::DictionaryValue& values) override; + virtual WriteResult Remove(const std::string& key) override; + virtual WriteResult Remove(const std::vector<std::string>& keys) override; + virtual WriteResult Clear() override; + virtual bool Restore() override; + virtual bool RestoreKey(const std::string& key) override; // Write directly to the backing levelDB. Only used for testing to cause // corruption in the database. diff --git a/extensions/browser/value_store/leveldb_value_store_unittest.cc b/extensions/browser/value_store/leveldb_value_store_unittest.cc index 2630a6d..a81f887 100644 --- a/extensions/browser/value_store/leveldb_value_store_unittest.cc +++ b/extensions/browser/value_store/leveldb_value_store_unittest.cc @@ -35,13 +35,13 @@ class LeveldbValueStoreUnitTest : public testing::Test { virtual ~LeveldbValueStoreUnitTest() {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(database_dir_.CreateUniqueTempDir()); OpenStore(); ASSERT_FALSE(store_->Get()->HasError()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { store_->Clear(); store_.reset(); } diff --git a/extensions/browser/value_store/testing_value_store.h b/extensions/browser/value_store/testing_value_store.h index dec5c2c..20faa7d 100644 --- a/extensions/browser/value_store/testing_value_store.h +++ b/extensions/browser/value_store/testing_value_store.h @@ -28,25 +28,25 @@ class TestingValueStore : public ValueStore { int write_count() { return write_count_; } // ValueStore implementation. - virtual size_t GetBytesInUse(const std::string& key) OVERRIDE; - virtual size_t GetBytesInUse(const std::vector<std::string>& keys) OVERRIDE; - virtual size_t GetBytesInUse() OVERRIDE; - virtual ReadResult Get(const std::string& key) OVERRIDE; - virtual ReadResult Get(const std::vector<std::string>& keys) OVERRIDE; - virtual ReadResult Get() OVERRIDE; + virtual size_t GetBytesInUse(const std::string& key) override; + virtual size_t GetBytesInUse(const std::vector<std::string>& keys) override; + virtual size_t GetBytesInUse() override; + virtual ReadResult Get(const std::string& key) override; + virtual ReadResult Get(const std::vector<std::string>& keys) override; + virtual ReadResult Get() override; virtual WriteResult Set( WriteOptions options, const std::string& key, - const base::Value& value) OVERRIDE; + const base::Value& value) override; virtual WriteResult Set( - WriteOptions options, const base::DictionaryValue& values) OVERRIDE; - virtual WriteResult Remove(const std::string& key) OVERRIDE; - virtual WriteResult Remove(const std::vector<std::string>& keys) OVERRIDE; - virtual WriteResult Clear() OVERRIDE; + WriteOptions options, const base::DictionaryValue& values) override; + virtual WriteResult Remove(const std::string& key) override; + virtual WriteResult Remove(const std::vector<std::string>& keys) override; + virtual WriteResult Clear() override; // TestingValueStores can't get corrupted (they're all in-memory), so these // just return true. - virtual bool Restore() OVERRIDE; - virtual bool RestoreKey(const std::string& key) OVERRIDE; + virtual bool Restore() override; + virtual bool RestoreKey(const std::string& key) override; private: scoped_ptr<ValueStore::Error> TestingError(); diff --git a/extensions/browser/value_store/value_store_unittest.h b/extensions/browser/value_store/value_store_unittest.h index 6360a5a..3571b35 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; + virtual void SetUp() override; + virtual void TearDown() override; protected: scoped_ptr<ValueStore> storage_; |