| Index: chrome/browser/permissions/chooser_context_base.cc
|
| diff --git a/chrome/browser/permissions/chooser_context_base.cc b/chrome/browser/permissions/chooser_context_base.cc
|
| index 3b99bad21385d39261562354ae5a096ce8d65c9f..1214898c8b39f6663cc98437009b551179c40efe 100644
|
| --- a/chrome/browser/permissions/chooser_context_base.cc
|
| +++ b/chrome/browser/permissions/chooser_context_base.cc
|
| @@ -58,7 +58,8 @@ ChooserContextBase::GetGrantedObjects(const GURL& requesting_origin,
|
| for (auto& object : *object_list) {
|
| // Steal ownership of |object| from |object_list|.
|
| std::unique_ptr<base::DictionaryValue> object_dict =
|
| - base::DictionaryValue::From(std::move(object));
|
| + base::DictionaryValue::From(
|
| + base::MakeUnique<base::Value>(std::move(object)));
|
| if (object_dict && IsValidObject(*object_dict))
|
| results.push_back(std::move(object_dict));
|
| }
|
| @@ -84,9 +85,9 @@ ChooserContextBase::GetAllGrantedObjects() {
|
| if (!setting->GetList(kObjectListKey, &object_list))
|
| continue;
|
|
|
| - for (const auto& object : *object_list) {
|
| + for (auto& object : *object_list) {
|
| base::DictionaryValue* object_dict;
|
| - if (!object->GetAsDictionary(&object_dict) ||
|
| + if (!object.GetAsDictionary(&object_dict) ||
|
| !IsValidObject(*object_dict)) {
|
| continue;
|
| }
|
|
|