Replace scoped_ptr with std::unique_ptr in //ui

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>
 
 #include "base/callback.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_string_value_serializer.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 
 namespace app_list {
 
 namespace {
 
 const char kKeyVersion[] = "version";
 const char kCurrentVersion[] = "1";
 
@@ skipping 27 matching lines @@
 //        "s" : [
 //                "result id of 1st (oldest) secondary association",
 //                ...
 //                "result id of the newest secondary association"
 //              ],
 //        "t" : "last_update_timestamp"
 //      },
 //      ...
 //    }
 //  }
-scoped_ptr<HistoryData::Associations> Parse(
-    scoped_ptr<base::DictionaryValue> dict) {
+std::unique_ptr<HistoryData::Associations> Parse(
+    std::unique_ptr<base::DictionaryValue> dict) {
   std::string version;
   if (!dict->GetStringWithoutPathExpansion(kKeyVersion, &version) ||
       version != kCurrentVersion) {
     return nullptr;
   }
 
   const base::DictionaryValue* assoc_dict = NULL;
   if (!dict->GetDictionaryWithoutPathExpansion(kKeyAssociations, &assoc_dict) ||
       !assoc_dict) {
     return nullptr;
   }
 
-  scoped_ptr<HistoryData::Associations> data(new HistoryData::Associations);
+  std::unique_ptr<HistoryData::Associations> data(
+      new HistoryData::Associations);
   for (base::DictionaryValue::Iterator it(*assoc_dict); !it.IsAtEnd();
        it.Advance()) {
     const base::DictionaryValue* entry_dict = NULL;
     if (!it.value().GetAsDictionary(&entry_dict))
       continue;
 
     std::string primary;
     std::string update_time_string;
     if (!entry_dict->GetStringWithoutPathExpansion(kKeyPrimary, &primary) ||
         !entry_dict->GetStringWithoutPathExpansion(kKeyUpdateTime,
@@ skipping 50 matching lines @@
     on_flushed.Run();
 }
 
 void HistoryDataStore::Load(
     const HistoryDataStore::OnLoadedCallback& on_loaded) {
   if (data_store_.get()) {
     data_store_->Load(base::Bind(
         &HistoryDataStore::OnDictionaryLoadedCallback, this, on_loaded));
   } else {
     OnDictionaryLoadedCallback(on_loaded,
-                               make_scoped_ptr(cached_dict_->DeepCopy()));
+                               base::WrapUnique(cached_dict_->DeepCopy()));
   }
 }
 
 void HistoryDataStore::SetPrimary(const std::string& query,
                                   const std::string& result) {
   base::DictionaryValue* entry_dict = GetEntryDict(query);
   entry_dict->SetWithoutPathExpansion(kKeyPrimary,
                                       new base::StringValue(result));
   if (data_store_.get())
     data_store_->ScheduleWrite();
 }
 
 void HistoryDataStore::SetSecondary(
     const std::string& query,
     const HistoryData::SecondaryDeque& results) {
-  scoped_ptr<base::ListValue> results_list(new base::ListValue);
+  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());
   if (data_store_.get())
     data_store_->ScheduleWrite();
 }
 
 void HistoryDataStore::SetUpdateTime(const std::string& query,
@@ skipping 34 matching lines @@
     // Creates one if none exists. Ownership is taken in the set call after.
     entry_dict = new base::DictionaryValue;
     assoc_dict->SetWithoutPathExpansion(query, entry_dict);
   }
 
   return entry_dict;
 }
 
 void HistoryDataStore::OnDictionaryLoadedCallback(
     OnLoadedCallback callback,
-    scoped_ptr<base::DictionaryValue> dict) {
+    std::unique_ptr<base::DictionaryValue> dict) {
   if (!dict) {
     callback.Run(nullptr);
   } else {
     callback.Run(Parse(std::move(dict)));
   }
 }
 
 }  // namespace app_list