Fix object ownership in ui/base/models.

ui/base/models/list_model_unittest.cc

 // Copyright (c) 2012 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/base/models/list_model.h"
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ui {
 
 class FooItem {
  public:
   explicit FooItem(int id) : id_(id) {}
 
   int id() const { return id_; }
 
@@ skipping 47 matching lines @@
   size_t changed_count_;
 
   DISALLOW_COPY_AND_ASSIGN(ListModelTest);
 };
 
 TEST_F(ListModelTest, Add) {
   ListModel<FooItem> model;
   model.AddObserver(this);
 
   // Append FooItem(0)
-  model.Add(new FooItem(0));
+  model.Add(base::MakeUnique<FooItem>(0));
   ExpectCountsEqual(1, 0, 0, 0);
 
   // Append FooItem(1)
-  model.Add(new FooItem(1));
+  model.Add(base::MakeUnique<FooItem>(1));
   ExpectCountsEqual(2, 0, 0, 0);
 
   // Insert FooItem(2) at position 0
-  model.AddAt(0, new FooItem(2));
+  model.AddAt(0, base::MakeUnique<FooItem>(2));
   ExpectCountsEqual(3, 0, 0, 0);
 
   // Total 3 items in model.
   EXPECT_EQ(3U, model.item_count());
 
   // First one should be FooItem(2), followed by FooItem(0) and FooItem(1)
   EXPECT_EQ(2, model.GetItemAt(0)->id());
   EXPECT_EQ(0, model.GetItemAt(1)->id());
   EXPECT_EQ(1, model.GetItemAt(2)->id());
 }
 
 TEST_F(ListModelTest, Remove) {
   ListModel<FooItem> model;
   model.AddObserver(this);
 
-  model.Add(new FooItem(0));
-  model.Add(new FooItem(1));
-  model.Add(new FooItem(2));
+  model.Add(base::MakeUnique<FooItem>(0));
+  model.Add(base::MakeUnique<FooItem>(1));
+  model.Add(base::MakeUnique<FooItem>(2));
 
   ClearCounts();
 
   // Remove item at index 1 from model and release memory.
   model.DeleteAt(1);
   ExpectCountsEqual(0, 1, 0, 0);
 
   EXPECT_EQ(2U, model.item_count());
   EXPECT_EQ(0, model.GetItemAt(0)->id());
   EXPECT_EQ(2, model.GetItemAt(1)->id());
 
   // Remove all items from model and delete them.
   model.DeleteAll();
   ExpectCountsEqual(0, 3, 0, 0);
 }
 
-TEST_F(ListModelTest, RemoveAll) {
+TEST_F(ListModelTest, DeleteAll) {
   ListModel<FooItem> model;
   model.AddObserver(this);
 
-  std::unique_ptr<FooItem> foo0(new FooItem(0));
-  std::unique_ptr<FooItem> foo1(new FooItem(1));
-  std::unique_ptr<FooItem> foo2(new FooItem(2));
-
-  model.Add(foo0.get());
-  model.Add(foo1.get());
-  model.Add(foo2.get());
+  model.Add(base::MakeUnique<FooItem>(0));
+  model.Add(base::MakeUnique<FooItem>(1));
+  model.Add(base::MakeUnique<FooItem>(2));
 
   ClearCounts();
 
-  // Remove all items and scoped_ptr above would release memory.
-  model.RemoveAll();
+  // Delete all items.
+  model.DeleteAll();
   ExpectCountsEqual(0, 3, 0, 0);
 }
 
 TEST_F(ListModelTest, Move) {
   ListModel<FooItem> model;
   model.AddObserver(this);
 
-  model.Add(new FooItem(0));
-  model.Add(new FooItem(1));
-  model.Add(new FooItem(2));
+  model.Add(base::MakeUnique<FooItem>(0));
+  model.Add(base::MakeUnique<FooItem>(1));
+  model.Add(base::MakeUnique<FooItem>(2));
 
   ClearCounts();
 
   // Moves item at index 0 to index 2.
   model.Move(0, 2);
   ExpectCountsEqual(0, 0, 1, 0);
   EXPECT_EQ(1, model.GetItemAt(0)->id());
   EXPECT_EQ(2, model.GetItemAt(1)->id());
   EXPECT_EQ(0, model.GetItemAt(2)->id());
 }
 
 TEST_F(ListModelTest, FakeUpdate) {
   ListModel<FooItem> model;
   model.AddObserver(this);
 
-  model.Add(new FooItem(0));
-  model.Add(new FooItem(1));
-  model.Add(new FooItem(2));
+  model.Add(base::MakeUnique<FooItem>(0));
+  model.Add(base::MakeUnique<FooItem>(1));
+  model.Add(base::MakeUnique<FooItem>(2));
 
   ClearCounts();
 
   model.NotifyItemsChanged(0, 1);
   ExpectCountsEqual(0, 0, 0, 1);
 
   model.NotifyItemsChanged(1, 2);
   ExpectCountsEqual(0, 0, 0, 3);
 }
 
 }  // namespace ui