Replace scoped_ptr with std::unique_ptr in //ui

ui/app_list/app_list_item_list.cc

 // Copyright (c) 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/app_list_item_list.h"
 
+#include "base/memory/ptr_util.h"
 #include "ui/app_list/app_list_item.h"
 
 namespace app_list {
 
 AppListItemList::AppListItemList() {
 }
 
 AppListItemList::~AppListItemList() {
 }
 
@@ skipping 147 matching lines @@
     }
   }
   if (index == 0)
     return app_list_items_[0]->position().CreateBefore();
   if (index == nitems)
     return app_list_items_[nitems - 1]->position().CreateAfter();
   return app_list_items_[index - 1]->position().CreateBetween(
       app_list_items_[index]->position());
 }
 
-AppListItem* AppListItemList::AddItem(scoped_ptr<AppListItem> item_ptr) {
+AppListItem* AppListItemList::AddItem(std::unique_ptr<AppListItem> item_ptr) {
   AppListItem* item = item_ptr.get();
   CHECK(std::find(app_list_items_.begin(), app_list_items_.end(), item)
         == app_list_items_.end());
   EnsureValidItemPosition(item);
   size_t index = GetItemSortOrderIndex(item->position(), item->id());
   app_list_items_.insert(app_list_items_.begin() + index, item_ptr.release());
   FOR_EACH_OBSERVER(AppListItemListObserver,
                     observers_,
                     OnListItemAdded(index, item));
 
   if (item->id() == highlighted_id_) {
     // Item not present when highlight requested, so highlight it now.
     item->set_highlighted(true);
     FOR_EACH_OBSERVER(AppListItemListObserver,
                       observers_,
                       OnAppListItemHighlight(index, true));
   }
   return item;
 }
 
 void AppListItemList::DeleteItem(const std::string& id) {
-  scoped_ptr<AppListItem> item = RemoveItem(id);
+  std::unique_ptr<AppListItem> item = RemoveItem(id);
   // |item| will be deleted on destruction.
 }
 
-scoped_ptr<AppListItem> AppListItemList::RemoveItem(const std::string& id) {
+std::unique_ptr<AppListItem> AppListItemList::RemoveItem(
+    const std::string& id) {
   size_t index;
   if (!FindItemIndex(id, &index))
     LOG(FATAL) << "RemoveItem: Not found: " << id;
   return RemoveItemAt(index);
 }
 
-scoped_ptr<AppListItem> AppListItemList::RemoveItemAt(size_t index) {
+std::unique_ptr<AppListItem> AppListItemList::RemoveItemAt(size_t index) {
   CHECK_LT(index, item_count());
   AppListItem* item = app_list_items_[index];
   app_list_items_.weak_erase(app_list_items_.begin() + index);
   FOR_EACH_OBSERVER(AppListItemListObserver,
                     observers_,
                     OnListItemRemoved(index, item));
-  return make_scoped_ptr<AppListItem>(item);
+  return base::WrapUnique<AppListItem>(item);
 }
 
 void AppListItemList::DeleteItemAt(size_t index) {
-  scoped_ptr<AppListItem> item = RemoveItemAt(index);
+  std::unique_ptr<AppListItem> item = RemoveItemAt(index);
   // |item| will be deleted on destruction.
 }
 
 void AppListItemList::EnsureValidItemPosition(AppListItem* item) {
   syncer::StringOrdinal position = item->position();
   if (position.IsValid())
     return;
   size_t nitems = app_list_items_.size();
   if (nitems == 0) {
     position = syncer::StringOrdinal::CreateInitialOrdinal();
@@ skipping 38 matching lines @@
     else
       cur->set_position(prev->position().CreateAfter());
     prev = cur;
   }
   FOR_EACH_OBSERVER(AppListItemListObserver,
                     observers_,
                     OnListItemMoved(index, index, app_list_items_[index]));
 }
 
 }  // namespace app_list