Replace scoped_ptr with std::unique_ptr in //ui

ui/app_list/search/dictionary_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/dictionary_data_store.h"
 
 #include <utility>
 
 #include "base/callback.h"
 #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"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 
 namespace app_list {
 
 DictionaryDataStore::DictionaryDataStore(const base::FilePath& data_file,
                                          base::SequencedWorkerPool* worker_pool)
@@ skipping 33 matching lines @@
       file_task_runner_.get(),
       FROM_HERE,
       base::Bind(&DictionaryDataStore::LoadOnBlockingPool, this),
       on_loaded);
 }
 
 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;
 }
 
 bool DictionaryDataStore::SerializeData(std::string* data) {
   JSONStringValueSerializer serializer(data);
   serializer.set_pretty_print(true);
   return serializer.Serialize(*cached_dict_.get());
 }
 
 }  // namespace app_list