Index: ui/app_list/search/dictionary_data_store.cc |
diff --git a/ui/app_list/search/dictionary_data_store.cc b/ui/app_list/search/dictionary_data_store.cc |
index 26c328ca9c676dd66e645a2db1c197e81e376062..aa807f6a12a37e229a2ff14f0074039976498c34 100644 |
--- a/ui/app_list/search/dictionary_data_store.cc |
+++ b/ui/app_list/search/dictionary_data_store.cc |
@@ -10,6 +10,7 @@ |
#include "base/json/json_file_value_serializer.h" |
#include "base/json/json_string_value_serializer.h" |
#include "base/logging.h" |
+#include "base/memory/ptr_util.h" |
#include "base/sequenced_task_runner.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/task_runner_util.h" |
@@ -63,20 +64,22 @@ void DictionaryDataStore::ScheduleWrite() { |
writer_->ScheduleWrite(this); |
} |
-scoped_ptr<base::DictionaryValue> DictionaryDataStore::LoadOnBlockingPool() { |
+std::unique_ptr<base::DictionaryValue> |
+DictionaryDataStore::LoadOnBlockingPool() { |
DCHECK(worker_pool_->RunsTasksOnCurrentThread()); |
int error_code = JSONFileValueDeserializer::JSON_NO_ERROR; |
std::string error_message; |
JSONFileValueDeserializer deserializer(data_file_); |
- scoped_ptr<base::DictionaryValue> dict_value = base::DictionaryValue::From( |
- deserializer.Deserialize(&error_code, &error_message)); |
+ std::unique_ptr<base::DictionaryValue> dict_value = |
+ base::DictionaryValue::From( |
+ deserializer.Deserialize(&error_code, &error_message)); |
if (error_code != JSONFileValueDeserializer::JSON_NO_ERROR || !dict_value) { |
return nullptr; |
} |
- scoped_ptr<base::DictionaryValue> return_dict = |
- make_scoped_ptr(dict_value.get()->DeepCopy()); |
+ std::unique_ptr<base::DictionaryValue> return_dict = |
+ base::WrapUnique(dict_value.get()->DeepCopy()); |
cached_dict_ = std::move(dict_value); |
return return_dict; |
} |