Replace scoped_ptr with std::unique_ptr in //ui

ui/app_list/test/app_list_test_model.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/test/app_list_test_model.h"
 
 #include <stddef.h>
 
+#include <memory>
 #include <utility>
 
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace app_list {
 namespace test {
 
 gfx::ImageSkia CreateImageSkia(int width, int height) {
   SkBitmap bitmap;
@@ skipping 32 matching lines @@
 }
 
 // AppListTestModel
 
 AppListTestModel::AppListTestModel()
     : activate_count_(0),
       last_activated_(NULL) {
 }
 
 AppListItem* AppListTestModel::AddItem(AppListItem* item) {
-  return AppListModel::AddItem(make_scoped_ptr(item));
+  return AppListModel::AddItem(base::WrapUnique(item));
 }
 
 AppListItem* AppListTestModel::AddItemToFolder(AppListItem* item,
                                                const std::string& folder_id) {
-  return AppListModel::AddItemToFolder(make_scoped_ptr(item), folder_id);
+  return AppListModel::AddItemToFolder(base::WrapUnique(item), folder_id);
 }
 
 void AppListTestModel::MoveItemToFolder(AppListItem* item,
                                         const std::string& folder_id) {
   AppListModel::MoveItemToFolder(item, folder_id);
 }
 
 
 std::string AppListTestModel::GetItemName(int id) {
   return base::StringPrintf("Item %d", id);
@@ skipping 61 matching lines @@
     position =
         top_level_item_list()->item_at(nitems - 1)->position().CreateAfter();
   }
   item->SetPosition(position);
   SetItemName(item, id);
   return item;
 }
 
 AppListTestModel::AppListTestItem* AppListTestModel::CreateAndAddItem(
     const std::string& id) {
-  scoped_ptr<AppListTestItem> test_item(CreateItem(id));
+  std::unique_ptr<AppListTestItem> test_item(CreateItem(id));
   AppListItem* item = AppListModel::AddItem(std::move(test_item));
   return static_cast<AppListTestItem*>(item);
 }
 void AppListTestModel::HighlightItemAt(int index) {
   AppListItem* item = top_level_item_list()->item_at(index);
   top_level_item_list()->HighlightItemInstalledFromUI(item->id());
 }
 
 void AppListTestModel::ItemActivated(AppListTestItem* item) {
   last_activated_ = item;
   ++activate_count_;
 }
 
 }  // namespace test
 }  // namespace app_list