| Index: chrome/browser/prefs/chrome_pref_service_unittest.cc
|
| diff --git a/chrome/browser/prefs/chrome_pref_service_unittest.cc b/chrome/browser/prefs/chrome_pref_service_unittest.cc
|
| index fbe56df30b388193b84947a1bf853c82ebe31106..4dab4fca53b4fc3610920e0a113e908ba6f58a19 100644
|
| --- a/chrome/browser/prefs/chrome_pref_service_unittest.cc
|
| +++ b/chrome/browser/prefs/chrome_pref_service_unittest.cc
|
| @@ -101,26 +101,29 @@ TEST_F(ChromePrefServiceUserFilePrefsTest, PreserveEmptyValue) {
|
|
|
| PrefServiceMockBuilder builder;
|
| builder.WithUserFilePrefs(pref_file, message_loop_.message_loop_proxy());
|
| - scoped_refptr<PrefRegistrySyncable> registry(new PrefRegistrySyncable);
|
| + scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
|
| + new user_prefs::PrefRegistrySyncable);
|
| scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable(registry));
|
|
|
| // Register testing prefs.
|
| registry->RegisterListPref("list",
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterDictionaryPref("dict",
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterDictionaryPref(
|
| + "dict",
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
|
|
| base::ListValue* non_empty_list = new base::ListValue;
|
| non_empty_list->Append(base::Value::CreateStringValue("test"));
|
| registry->RegisterListPref("list_needs_empty_value",
|
| non_empty_list,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
|
|
| base::DictionaryValue* non_empty_dict = new base::DictionaryValue;
|
| non_empty_dict->SetString("dummy", "whatever");
|
| - registry->RegisterDictionaryPref("dict_needs_empty_value",
|
| - non_empty_dict,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterDictionaryPref(
|
| + "dict_needs_empty_value",
|
| + non_empty_dict,
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
|
|
| // Set all testing prefs to empty.
|
| ClearListValue(prefs.get(), "list");
|
|
|