| Index: ui/app_list/search/history_data_store.cc
|
| diff --git a/ui/app_list/search/history_data_store.cc b/ui/app_list/search/history_data_store.cc
|
| index d080fa6a96381ff65c83298d6cc7209ca3d76d0f..27d66707f5061ed654ea6ed91090716da38a3b40 100644
|
| --- a/ui/app_list/search/history_data_store.cc
|
| +++ b/ui/app_list/search/history_data_store.cc
|
| @@ -165,7 +165,7 @@ void HistoryDataStore::SetSecondary(
|
| results_list->AppendString(results[i]);
|
|
|
| base::DictionaryValue* entry_dict = GetEntryDict(query);
|
| - entry_dict->SetWithoutPathExpansion(kKeySecondary, results_list.release());
|
| + entry_dict->SetWithoutPathExpansion(kKeySecondary, std::move(results_list));
|
| if (data_store_.get())
|
| data_store_->ScheduleWrite();
|
| }
|
| @@ -205,8 +205,9 @@ base::DictionaryValue* HistoryDataStore::GetEntryDict(
|
| base::DictionaryValue* entry_dict = nullptr;
|
| if (!assoc_dict->GetDictionaryWithoutPathExpansion(query, &entry_dict)) {
|
| // Creates one if none exists. Ownership is taken in the set call after.
|
| - entry_dict = new base::DictionaryValue;
|
| - assoc_dict->SetWithoutPathExpansion(query, base::WrapUnique(entry_dict));
|
| + assoc_dict->SetWithoutPathExpansion(
|
| + query, base::MakeUnique<base::DictionaryValue>());
|
| + assoc_dict->GetDictionaryWithoutPathExpansion(query, &entry_dict);
|
| }
|
|
|
| return entry_dict;
|
|
|