Remove SetWithoutPathExpansion

ui/app_list/search/history_data_store.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/app_list/search/history_data_store.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 147 matching lines @@
 }
 
 void HistoryDataStore::SetSecondary(
     const std::string& query,
     const HistoryData::SecondaryDeque& results) {
   std::unique_ptr<base::ListValue> results_list(new base::ListValue);
   for (size_t i = 0; i < results.size(); ++i)
     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();
 }
 
 void HistoryDataStore::SetUpdateTime(const std::string& query,
                                      const base::Time& update_time) {
   base::DictionaryValue* entry_dict = GetEntryDict(query);
   entry_dict->SetStringWithoutPathExpansion(
       kKeyUpdateTime, base::Int64ToString(update_time.ToInternalValue()));
   if (data_store_.get())
@@ skipping 19 matching lines @@
   return assoc_dict;
 }
 
 base::DictionaryValue* HistoryDataStore::GetEntryDict(
     const std::string& query) {
   base::DictionaryValue* assoc_dict = GetAssociationDict();
 
   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;
 }
 
 void HistoryDataStore::OnDictionaryLoadedCallback(
     OnLoadedCallback callback,
     std::unique_ptr<base::DictionaryValue> dict) {
   if (!dict) {
     callback.Run(nullptr);
   } else {
     callback.Run(Parse(std::move(dict)));
   }
 }
 
 }  // namespace app_list