Index: chrome/browser/ui/app_list/test/fast_show_pickler_unittest.cc |
diff --git a/chrome/browser/ui/app_list/test/fast_show_pickler_unittest.cc b/chrome/browser/ui/app_list/test/fast_show_pickler_unittest.cc |
index 579728d44a7cfa93ec87e13df69a68d58017d0e7..21304ee2d66add3ead7151bc7da9546ef3e38177 100644 |
--- a/chrome/browser/ui/app_list/test/fast_show_pickler_unittest.cc |
+++ b/chrome/browser/ui/app_list/test/fast_show_pickler_unittest.cc |
@@ -2,9 +2,11 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include "chrome/browser/ui/app_list/fast_show_pickler.h" |
+ |
#include <stddef.h> |
-#include "chrome/browser/ui/app_list/fast_show_pickler.h" |
+#include "base/memory/ptr_util.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "third_party/skia/include/core/SkBitmap.h" |
#include "third_party/skia/include/core/SkColorPriv.h" |
@@ -46,14 +48,14 @@ class AppListModelPicklerUnitTest : public testing::Test { |
} |
} |
- scoped_ptr<AppListModel> CopyViaPickle(AppListModel* model) { |
- scoped_ptr<base::Pickle> pickle( |
+ std::unique_ptr<AppListModel> CopyViaPickle(AppListModel* model) { |
+ std::unique_ptr<base::Pickle> pickle( |
FastShowPickler::PickleAppListModelForFastShow(model)); |
return FastShowPickler::UnpickleAppListModelForFastShow(pickle.get()); |
} |
void DoConsistencyChecks(AppListModel* model) { |
- scoped_ptr<AppListModel> model2(CopyViaPickle(model)); |
+ std::unique_ptr<AppListModel> model2(CopyViaPickle(model)); |
AppListModel dest_model; |
FastShowPickler::CopyOver(model2.get(), &dest_model); |
@@ -79,15 +81,15 @@ TEST_F(AppListModelPicklerUnitTest, EmptyModel) { |
TEST_F(AppListModelPicklerUnitTest, OneItem) { |
AppListModel model; |
- model.AddItem(make_scoped_ptr(new AppListItem("abc"))); |
+ model.AddItem(base::WrapUnique(new AppListItem("abc"))); |
DoConsistencyChecks(&model); |
} |
TEST_F(AppListModelPicklerUnitTest, TwoItems) { |
AppListModel model; |
- AppListItem* app1 = model.AddItem(make_scoped_ptr(new AppListItem("abc"))); |
+ AppListItem* app1 = model.AddItem(base::WrapUnique(new AppListItem("abc"))); |
model.SetItemNameAndShortName(app1, "hello, there", "ht"); |
- AppListItem* app2 = model.AddItem(make_scoped_ptr(new AppListItem("abc2"))); |
+ AppListItem* app2 = model.AddItem(base::WrapUnique(new AppListItem("abc2"))); |
model.SetItemNameAndShortName(app2, "hello, there 2", "ht2"); |
DoConsistencyChecks(&model); |
@@ -95,10 +97,10 @@ TEST_F(AppListModelPicklerUnitTest, TwoItems) { |
TEST_F(AppListModelPicklerUnitTest, Images) { |
AppListModel model; |
- AppListItem* app1 = model.AddItem(make_scoped_ptr(new AppListItem("abc"))); |
+ AppListItem* app1 = model.AddItem(base::WrapUnique(new AppListItem("abc"))); |
model.SetItemName(app1, "hello, there"); |
app1->SetIcon(MakeImage()); |
- AppListItem* app2 = model.AddItem(make_scoped_ptr(new AppListItem("abc2"))); |
+ AppListItem* app2 = model.AddItem(base::WrapUnique(new AppListItem("abc2"))); |
model.SetItemName(app2, "hello, there 2"); |
DoConsistencyChecks(&model); |
@@ -106,7 +108,7 @@ TEST_F(AppListModelPicklerUnitTest, Images) { |
TEST_F(AppListModelPicklerUnitTest, EmptyImage) { |
AppListModel model; |
- AppListItem* app1 = model.AddItem(make_scoped_ptr(new AppListItem("abc"))); |
+ AppListItem* app1 = model.AddItem(base::WrapUnique(new AppListItem("abc"))); |
model.SetItemName(app1, "hello, there"); |
app1->SetIcon(gfx::ImageSkia()); |