| Index: base/prefs/json_pref_store.cc
|
| diff --git a/base/prefs/json_pref_store.cc b/base/prefs/json_pref_store.cc
|
| index c2ff42593fad0eef46fa7fdba82c6546905d5055..354fd948681b91ef588fa70ca7e23714ed437a82 100644
|
| --- a/base/prefs/json_pref_store.cc
|
| +++ b/base/prefs/json_pref_store.cc
|
| @@ -221,31 +221,29 @@ bool JsonPrefStore::GetMutableValue(const std::string& key,
|
| }
|
|
|
| void JsonPrefStore::SetValue(const std::string& key,
|
| - base::Value* value,
|
| + scoped_ptr<base::Value> value,
|
| uint32 flags) {
|
| DCHECK(CalledOnValidThread());
|
|
|
| DCHECK(value);
|
| - scoped_ptr<base::Value> new_value(value);
|
| base::Value* old_value = NULL;
|
| prefs_->Get(key, &old_value);
|
| if (!old_value || !value->Equals(old_value)) {
|
| - prefs_->Set(key, new_value.Pass());
|
| + prefs_->Set(key, value.Pass());
|
| ReportValueChanged(key, flags);
|
| }
|
| }
|
|
|
| void JsonPrefStore::SetValueSilently(const std::string& key,
|
| - base::Value* value,
|
| + scoped_ptr<base::Value> value,
|
| uint32 flags) {
|
| DCHECK(CalledOnValidThread());
|
|
|
| DCHECK(value);
|
| - scoped_ptr<base::Value> new_value(value);
|
| base::Value* old_value = NULL;
|
| prefs_->Get(key, &old_value);
|
| if (!old_value || !value->Equals(old_value)) {
|
| - prefs_->Set(key, new_value.Pass());
|
| + prefs_->Set(key, value.Pass());
|
| ScheduleWrite(flags);
|
| }
|
| }
|
|
|