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

chrome/browser/ui/app_list/test/fast_show_pickler_unittest.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 "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"
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/test/app_list_test_model.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/skia_util.h"
 
 using app_list::AppListItem;
@@ skipping 21 matching lines @@
     std::vector<gfx::ImageSkiaRep> reps1(image1.image_reps());
     std::vector<gfx::ImageSkiaRep> reps2(image2.image_reps());
     ASSERT_EQ(reps1.size(), reps2.size());
     for (size_t i = 0; i < reps1.size(); ++i) {
       ASSERT_TRUE(
           gfx::BitmapsAreEqual(reps1[i].sk_bitmap(), reps2[i].sk_bitmap()));
       ASSERT_EQ(reps1[i].scale(), reps2[i].scale());
     }
   }
 
-  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);
 
     CheckIsSame(model, model2.get());
     CheckIsSame(model, &dest_model);
     CheckIsSame(model2.get(), &dest_model);
   }
 
   gfx::ImageSkia MakeImage() {
     const int kWidth = 10;
     const int kHeight = 10;
     SkBitmap bitmap;
     bitmap.allocN32Pixels(kWidth, kHeight);
     bitmap.eraseARGB(255, 1, 2, 3);
     return gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
   }
 };
 
 TEST_F(AppListModelPicklerUnitTest, EmptyModel) {
   AppListModel model;
   DoConsistencyChecks(&model);
 }
 
 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);
 }
 
 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);
 }
 
 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());
 
   DoConsistencyChecks(&model);
 }