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 a26afd71375ebe3a7654ec042a67caf763c4f2e0..119a29cd96c94eede7e15a9a81c14f3db3dcdfa0 100644 |
--- a/base/prefs/json_pref_store_unittest.cc |
+++ b/base/prefs/json_pref_store_unittest.cc |
@@ -9,6 +9,7 @@ |
#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/path_service.h" |
+#include "base/prefs/pref_filter.h" |
#include "base/run_loop.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/string_util.h" |
@@ -60,7 +61,9 @@ TEST_F(JsonPrefStoreTest, NonExistentFile) { |
base::FilePath bogus_input_file = data_dir_.AppendASCII("read.txt"); |
ASSERT_FALSE(PathExists(bogus_input_file)); |
scoped_refptr<JsonPrefStore> pref_store = new JsonPrefStore( |
- bogus_input_file, message_loop_.message_loop_proxy().get()); |
+ bogus_input_file, |
+ message_loop_.message_loop_proxy().get(), |
+ scoped_ptr<PrefFilter>()); |
EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_NO_FILE, |
pref_store->ReadPrefs()); |
EXPECT_FALSE(pref_store->ReadOnly()); |
@@ -72,7 +75,9 @@ TEST_F(JsonPrefStoreTest, InvalidFile) { |
base::FilePath invalid_file = temp_dir_.path().AppendASCII("invalid.json"); |
ASSERT_TRUE(base::CopyFile(invalid_file_original, invalid_file)); |
scoped_refptr<JsonPrefStore> pref_store = |
- new JsonPrefStore(invalid_file, message_loop_.message_loop_proxy().get()); |
+ new JsonPrefStore(invalid_file, |
+ message_loop_.message_loop_proxy().get(), |
+ scoped_ptr<PrefFilter>()); |
EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_JSON_PARSE, |
pref_store->ReadPrefs()); |
EXPECT_FALSE(pref_store->ReadOnly()); |
@@ -157,8 +162,10 @@ TEST_F(JsonPrefStoreTest, Basic) { |
// Test that the persistent value can be loaded. |
base::FilePath input_file = temp_dir_.path().AppendASCII("write.json"); |
ASSERT_TRUE(PathExists(input_file)); |
- scoped_refptr<JsonPrefStore> pref_store = |
- new JsonPrefStore(input_file, message_loop_.message_loop_proxy().get()); |
+ scoped_refptr<JsonPrefStore> pref_store = new JsonPrefStore( |
+ input_file, |
+ message_loop_.message_loop_proxy().get(), |
+ scoped_ptr<PrefFilter>()); |
ASSERT_EQ(PersistentPrefStore::PREF_READ_ERROR_NONE, pref_store->ReadPrefs()); |
ASSERT_FALSE(pref_store->ReadOnly()); |
@@ -183,8 +190,10 @@ TEST_F(JsonPrefStoreTest, BasicAsync) { |
// Test that the persistent value can be loaded. |
base::FilePath input_file = temp_dir_.path().AppendASCII("write.json"); |
ASSERT_TRUE(PathExists(input_file)); |
- scoped_refptr<JsonPrefStore> pref_store = |
- new JsonPrefStore(input_file, message_loop_.message_loop_proxy().get()); |
+ scoped_refptr<JsonPrefStore> pref_store = new JsonPrefStore( |
+ input_file, |
+ message_loop_.message_loop_proxy().get(), |
+ scoped_ptr<PrefFilter>()); |
{ |
MockPrefStoreObserver mock_observer; |
@@ -219,8 +228,10 @@ TEST_F(JsonPrefStoreTest, BasicAsync) { |
TEST_F(JsonPrefStoreTest, PreserveEmptyValues) { |
FilePath pref_file = temp_dir_.path().AppendASCII("empty_values.json"); |
- scoped_refptr<JsonPrefStore> pref_store = |
- new JsonPrefStore(pref_file, message_loop_.message_loop_proxy()); |
+ scoped_refptr<JsonPrefStore> pref_store = new JsonPrefStore( |
+ pref_file, |
+ message_loop_.message_loop_proxy(), |
+ scoped_ptr<PrefFilter>()); |
// Set some keys with empty values. |
pref_store->SetValue("list", new base::ListValue); |
@@ -231,7 +242,10 @@ TEST_F(JsonPrefStoreTest, PreserveEmptyValues) { |
MessageLoop::current()->RunUntilIdle(); |
// Reload. |
- pref_store = new JsonPrefStore(pref_file, message_loop_.message_loop_proxy()); |
+ pref_store = new JsonPrefStore( |
+ pref_file, |
+ message_loop_.message_loop_proxy(), |
+ scoped_ptr<PrefFilter>()); |
ASSERT_EQ(PersistentPrefStore::PREF_READ_ERROR_NONE, pref_store->ReadPrefs()); |
ASSERT_FALSE(pref_store->ReadOnly()); |
@@ -248,7 +262,9 @@ TEST_F(JsonPrefStoreTest, AsyncNonExistingFile) { |
base::FilePath bogus_input_file = data_dir_.AppendASCII("read.txt"); |
ASSERT_FALSE(PathExists(bogus_input_file)); |
scoped_refptr<JsonPrefStore> pref_store = new JsonPrefStore( |
- bogus_input_file, message_loop_.message_loop_proxy().get()); |
+ bogus_input_file, |
+ message_loop_.message_loop_proxy().get(), |
+ scoped_ptr<PrefFilter>()); |
MockPrefStoreObserver mock_observer; |
pref_store->AddObserver(&mock_observer); |