Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

chrome/browser/ui/app_list/fast_show_pickler.cc

Index: chrome/browser/ui/app_list/fast_show_pickler.cc
diff --git a/chrome/browser/ui/app_list/fast_show_pickler.cc b/chrome/browser/ui/app_list/fast_show_pickler.cc
index 6b4b4fbddbfc7ee562f4f9476cd4fa7a8633f6c6..5aa2b4752126572163084172cffbbdc5b05dbb47 100644
--- a/chrome/browser/ui/app_list/fast_show_pickler.cc
+++ b/chrome/browser/ui/app_list/fast_show_pickler.cc
@@ -149,22 +149,22 @@ bool UnpickleImage(base::PickleIterator* it, gfx::ImageSkia* out) {
 
 }  // namespace
 
-scoped_ptr<AppListItem> FastShowPickler::UnpickleAppListItem(
+std::unique_ptr<AppListItem> FastShowPickler::UnpickleAppListItem(
     base::PickleIterator* it) {
   std::string id;
   if (!it->ReadString(&id))
-    return scoped_ptr<AppListItem>();
-  scoped_ptr<AppListItem> result(new AppListItem(id));
+    return std::unique_ptr<AppListItem>();
+  std::unique_ptr<AppListItem> result(new AppListItem(id));
   std::string name;
   if (!it->ReadString(&name))
-    return scoped_ptr<AppListItem>();
+    return std::unique_ptr<AppListItem>();
   std::string short_name;
   if (!it->ReadString(&short_name))
-    return scoped_ptr<AppListItem>();
+    return std::unique_ptr<AppListItem>();
   result->SetNameAndShortName(name, short_name);
   gfx::ImageSkia icon;
   if (!UnpickleImage(it, &icon))
-    return scoped_ptr<AppListItem>();
+    return std::unique_ptr<AppListItem>();
   result->SetIcon(icon);
   return result;
 }
@@ -193,17 +193,17 @@ void FastShowPickler::CopyOverItem(AppListItem* src_item,
 // whenever this format is changed so new clients can invalidate old versions.
 const int FastShowPickler::kVersion = 4;
 
-scoped_ptr<base::Pickle> FastShowPickler::PickleAppListModelForFastShow(
+std::unique_ptr<base::Pickle> FastShowPickler::PickleAppListModelForFastShow(
     AppListModel* model) {
-  scoped_ptr<base::Pickle> result(new base::Pickle);
+  std::unique_ptr<base::Pickle> result(new base::Pickle);
   if (!result->WriteInt(kVersion))
-    return scoped_ptr<base::Pickle>();
+    return std::unique_ptr<base::Pickle>();
   if (!result->WriteInt((int)model->top_level_item_list()->item_count()))
-    return scoped_ptr<base::Pickle>();
+    return std::unique_ptr<base::Pickle>();
   for (size_t i = 0; i < model->top_level_item_list()->item_count(); ++i) {
     if (!PickleAppListItem(result.get(),
                            model->top_level_item_list()->item_at(i))) {
-      return scoped_ptr<base::Pickle>();
+      return std::unique_ptr<base::Pickle>();
     }
   }
   return result;
@@ -213,29 +213,29 @@ void FastShowPickler::CopyOver(AppListModel* src, AppListModel* dest) {
   DCHECK_EQ(0u, dest->top_level_item_list()->item_count());
   for (size_t i = 0; i < src->top_level_item_list()->item_count(); i++) {
     AppListItem* src_item = src->top_level_item_list()->item_at(i);
-    scoped_ptr<AppListItem> dest_item(new AppListItem(src_item->id()));
+    std::unique_ptr<AppListItem> dest_item(new AppListItem(src_item->id()));
     CopyOverItem(src_item, dest_item.get());
     dest->AddItemToFolder(std::move(dest_item), src_item->folder_id());
   }
 }
 
-scoped_ptr<AppListModel> FastShowPickler::UnpickleAppListModelForFastShow(
+std::unique_ptr<AppListModel> FastShowPickler::UnpickleAppListModelForFastShow(
     base::Pickle* pickle) {
   base::PickleIterator it(*pickle);
   int read_version = 0;
   if (!it.ReadInt(&read_version))
-    return scoped_ptr<AppListModel>();
+    return std::unique_ptr<AppListModel>();
   if (read_version != kVersion)
-    return scoped_ptr<AppListModel>();
+    return std::unique_ptr<AppListModel>();
   int app_count = 0;
   if (!it.ReadInt(&app_count))
-    return scoped_ptr<AppListModel>();
+    return std::unique_ptr<AppListModel>();
 
-  scoped_ptr<AppListModel> model(new AppListModel);
+  std::unique_ptr<AppListModel> model(new AppListModel);
   for (int i = 0; i < app_count; ++i) {
-    scoped_ptr<AppListItem> item(UnpickleAppListItem(&it));
+    std::unique_ptr<AppListItem> item(UnpickleAppListItem(&it));
     if (!item)
-      return scoped_ptr<AppListModel>();
+      return std::unique_ptr<AppListModel>();
     std::string folder_id = item->folder_id();
     model->AddItemToFolder(std::move(item), folder_id);
   }