| Index: base/prefs/json_pref_store_unittest.cc
|
| diff --git a/base/prefs/json_pref_store_unittest.cc b/base/prefs/json_pref_store_unittest.cc
|
| index d09d9d3926cacec756812d414513ce4639cbcd03..32c376a616bdee44ab5954d7d3c4d48536711f04 100644
|
| --- a/base/prefs/json_pref_store_unittest.cc
|
| +++ b/base/prefs/json_pref_store_unittest.cc
|
| @@ -35,12 +35,12 @@ class InterceptingPrefFilter : public PrefFilter {
|
| virtual ~InterceptingPrefFilter();
|
|
|
| // PrefFilter implementation:
|
| - virtual void FilterOnLoad(
|
| + void FilterOnLoad(
|
| const PostFilterOnLoadCallback& post_filter_on_load_callback,
|
| - scoped_ptr<base::DictionaryValue> pref_store_contents) OVERRIDE;
|
| - virtual void FilterUpdate(const std::string& path) OVERRIDE {}
|
| - virtual void FilterSerializeData(
|
| - base::DictionaryValue* pref_store_contents) OVERRIDE {}
|
| + scoped_ptr<base::DictionaryValue> pref_store_contents) override;
|
| + void FilterUpdate(const std::string& path) override {}
|
| + void FilterSerializeData(
|
| + base::DictionaryValue* pref_store_contents) override {}
|
|
|
| bool has_intercepted_prefs() const { return intercepted_prefs_ != NULL; }
|
|
|
| @@ -86,7 +86,7 @@ class MockReadErrorDelegate : public PersistentPrefStore::ReadErrorDelegate {
|
|
|
| class JsonPrefStoreTest : public testing::Test {
|
| protected:
|
| - virtual void SetUp() OVERRIDE {
|
| + void SetUp() override {
|
| ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
|
|
|
| ASSERT_TRUE(PathService::Get(base::DIR_TEST_DATA, &data_dir_));
|
| @@ -94,7 +94,7 @@ class JsonPrefStoreTest : public testing::Test {
|
| ASSERT_TRUE(PathExists(data_dir_));
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + void TearDown() override {
|
| // Make sure all pending tasks have been processed (e.g., deleting the
|
| // JsonPrefStore may post write tasks).
|
| message_loop_.PostTask(FROM_HERE, MessageLoop::QuitWhenIdleClosure());
|
|
|