Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Side by Side Diff: base/prefs/json_pref_store_unittest.cc

Issue 614103004: replace 'virtual ... OVERRIDE' with '... override' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: process base/ Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/prefs/json_pref_store.h" 5 #include "base/prefs/json_pref_store.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 17 matching lines...) Expand all
28 const char kHomePage[] = "homepage"; 28 const char kHomePage[] = "homepage";
29 29
30 // A PrefFilter that will intercept all calls to FilterOnLoad() and hold on 30 // A PrefFilter that will intercept all calls to FilterOnLoad() and hold on
31 // to the |prefs| until explicitly asked to release them. 31 // to the |prefs| until explicitly asked to release them.
32 class InterceptingPrefFilter : public PrefFilter { 32 class InterceptingPrefFilter : public PrefFilter {
33 public: 33 public:
34 InterceptingPrefFilter(); 34 InterceptingPrefFilter();
35 virtual ~InterceptingPrefFilter(); 35 virtual ~InterceptingPrefFilter();
36 36
37 // PrefFilter implementation: 37 // PrefFilter implementation:
38 virtual void FilterOnLoad( 38 void FilterOnLoad(
39 const PostFilterOnLoadCallback& post_filter_on_load_callback, 39 const PostFilterOnLoadCallback& post_filter_on_load_callback,
40 scoped_ptr<base::DictionaryValue> pref_store_contents) OVERRIDE; 40 scoped_ptr<base::DictionaryValue> pref_store_contents) override;
41 virtual void FilterUpdate(const std::string& path) OVERRIDE {} 41 void FilterUpdate(const std::string& path) override {}
42 virtual void FilterSerializeData( 42 void FilterSerializeData(
43 base::DictionaryValue* pref_store_contents) OVERRIDE {} 43 base::DictionaryValue* pref_store_contents) override {}
44 44
45 bool has_intercepted_prefs() const { return intercepted_prefs_ != NULL; } 45 bool has_intercepted_prefs() const { return intercepted_prefs_ != NULL; }
46 46
47 // Finalize an intercepted read, handing |intercepted_prefs_| back to its 47 // Finalize an intercepted read, handing |intercepted_prefs_| back to its
48 // JsonPrefStore. 48 // JsonPrefStore.
49 void ReleasePrefs(); 49 void ReleasePrefs();
50 50
51 private: 51 private:
52 PostFilterOnLoadCallback post_filter_on_load_callback_; 52 PostFilterOnLoadCallback post_filter_on_load_callback_;
53 scoped_ptr<base::DictionaryValue> intercepted_prefs_; 53 scoped_ptr<base::DictionaryValue> intercepted_prefs_;
(...skipping 25 matching lines...) Expand all
79 79
80 class MockReadErrorDelegate : public PersistentPrefStore::ReadErrorDelegate { 80 class MockReadErrorDelegate : public PersistentPrefStore::ReadErrorDelegate {
81 public: 81 public:
82 MOCK_METHOD1(OnError, void(PersistentPrefStore::PrefReadError)); 82 MOCK_METHOD1(OnError, void(PersistentPrefStore::PrefReadError));
83 }; 83 };
84 84
85 } // namespace 85 } // namespace
86 86
87 class JsonPrefStoreTest : public testing::Test { 87 class JsonPrefStoreTest : public testing::Test {
88 protected: 88 protected:
89 virtual void SetUp() OVERRIDE { 89 void SetUp() override {
90 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 90 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
91 91
92 ASSERT_TRUE(PathService::Get(base::DIR_TEST_DATA, &data_dir_)); 92 ASSERT_TRUE(PathService::Get(base::DIR_TEST_DATA, &data_dir_));
93 data_dir_ = data_dir_.AppendASCII("prefs"); 93 data_dir_ = data_dir_.AppendASCII("prefs");
94 ASSERT_TRUE(PathExists(data_dir_)); 94 ASSERT_TRUE(PathExists(data_dir_));
95 } 95 }
96 96
97 virtual void TearDown() OVERRIDE { 97 void TearDown() override {
98 // Make sure all pending tasks have been processed (e.g., deleting the 98 // Make sure all pending tasks have been processed (e.g., deleting the
99 // JsonPrefStore may post write tasks). 99 // JsonPrefStore may post write tasks).
100 message_loop_.PostTask(FROM_HERE, MessageLoop::QuitWhenIdleClosure()); 100 message_loop_.PostTask(FROM_HERE, MessageLoop::QuitWhenIdleClosure());
101 message_loop_.Run(); 101 message_loop_.Run();
102 } 102 }
103 103
104 // The path to temporary directory used to contain the test operations. 104 // The path to temporary directory used to contain the test operations.
105 base::ScopedTempDir temp_dir_; 105 base::ScopedTempDir temp_dir_;
106 // The path to the directory where the test data is stored. 106 // The path to the directory where the test data is stored.
107 base::FilePath data_dir_; 107 base::FilePath data_dir_;
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 // "new_windows_in_tabs": true, 665 // "new_windows_in_tabs": true,
666 // "max_tabs": 20 666 // "max_tabs": 20
667 // } 667 // }
668 // } 668 // }
669 669
670 RunBasicJsonPrefStoreTest( 670 RunBasicJsonPrefStoreTest(
671 pref_store.get(), input_file, data_dir_.AppendASCII("write.golden.json")); 671 pref_store.get(), input_file, data_dir_.AppendASCII("write.golden.json"));
672 } 672 }
673 673
674 } // namespace base 674 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698