OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
7 #include "base/files/scoped_temp_dir.h" | 7 #include "base/files/scoped_temp_dir.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 // Verifies that ListValue and DictionaryValue pref with non emtpy default | 91 // Verifies that ListValue and DictionaryValue pref with non emtpy default |
92 // preserves its empty value. | 92 // preserves its empty value. |
93 TEST_F(ChromePrefServiceUserFilePrefsTest, PreserveEmptyValue) { | 93 TEST_F(ChromePrefServiceUserFilePrefsTest, PreserveEmptyValue) { |
94 base::FilePath pref_file = temp_dir_.path().AppendASCII("write.json"); | 94 base::FilePath pref_file = temp_dir_.path().AppendASCII("write.json"); |
95 | 95 |
96 ASSERT_TRUE(file_util::CopyFile( | 96 ASSERT_TRUE(file_util::CopyFile( |
97 data_dir_.AppendASCII("read.need_empty_value.json"), | 97 data_dir_.AppendASCII("read.need_empty_value.json"), |
98 pref_file)); | 98 pref_file)); |
99 | 99 |
100 PrefServiceMockBuilder builder; | 100 PrefServiceMockBuilder builder; |
101 builder.WithUserFilePrefs(pref_file, message_loop_.message_loop_proxy()); | 101 builder.WithUserFilePrefs(pref_file, |
| 102 message_loop_.message_loop_proxy().get()); |
102 scoped_refptr<user_prefs::PrefRegistrySyncable> registry( | 103 scoped_refptr<user_prefs::PrefRegistrySyncable> registry( |
103 new user_prefs::PrefRegistrySyncable); | 104 new user_prefs::PrefRegistrySyncable); |
104 scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable(registry.get())); | 105 scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable(registry.get())); |
105 | 106 |
106 // Register testing prefs. | 107 // Register testing prefs. |
107 registry->RegisterListPref("list", | 108 registry->RegisterListPref("list", |
108 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 109 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
109 registry->RegisterDictionaryPref( | 110 registry->RegisterDictionaryPref( |
110 "dict", | 111 "dict", |
111 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 112 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 const char kDefaultFont[] = "Times"; | 186 const char kDefaultFont[] = "Times"; |
186 #elif defined(OS_CHROMEOS) | 187 #elif defined(OS_CHROMEOS) |
187 const char kDefaultFont[] = "Tinos"; | 188 const char kDefaultFont[] = "Tinos"; |
188 #else | 189 #else |
189 const char kDefaultFont[] = "Times New Roman"; | 190 const char kDefaultFont[] = "Times New Roman"; |
190 #endif | 191 #endif |
191 EXPECT_EQ(ASCIIToUTF16(kDefaultFont), | 192 EXPECT_EQ(ASCIIToUTF16(kDefaultFont), |
192 webkit_prefs.standard_font_family_map[prefs::kWebKitCommonScript]); | 193 webkit_prefs.standard_font_family_map[prefs::kWebKitCommonScript]); |
193 EXPECT_TRUE(webkit_prefs.javascript_enabled); | 194 EXPECT_TRUE(webkit_prefs.javascript_enabled); |
194 } | 195 } |
OLD | NEW |