Fix object ownership in ui/base/models.

ui/views/controls/tree/tree_view_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/views/controls/tree/tree_view.h"
 
 #include <string>
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/models/tree_node_model.h"
 #include "ui/views/controls/prefix_selector.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/views_test_base.h"
 
 using ui::TreeModel;
 using ui::TreeModelNode;
 using ui::TreeNode;
@@ skipping 12 matching lines @@
 };
 
 // Creates the following structure:
 // 'root'
 //   'a'
 //   'b'
 //     'b1'
 //   'c'
 class TreeViewTest : public ViewsTestBase {
  public:
-  TreeViewTest() : model_(new TestNode) {
+  TreeViewTest() : model_(base::MakeUnique<TestNode>()) {
     static_cast<TestNode*>(model_.GetRoot())->SetTitle(ASCIIToUTF16("root"));
     Add(model_.GetRoot(), 0, "a");
     Add(Add(model_.GetRoot(), 1, "b"), 0, "b1");
     Add(model_.GetRoot(), 2, "c");
   }
 
  protected:
   TestNode* Add(TestNode* parent,
                 int index,
                 const std::string& title);
 
   std::string TreeViewContentsAsString();
 
   std::string GetSelectedNodeTitle();
 
   std::string GetEditingNodeTitle();
 
   TestNode* GetNodeByTitle(const std::string& title);
 
   void IncrementSelection(bool next);
   void CollapseOrSelectParent();
   void ExpandOrSelectChild();
   int GetRowCount();
   PrefixSelector* selector() { return tree_.GetPrefixSelector(); }
 
-  ui::TreeNodeModel<TestNode > model_;
+  ui::TreeNodeModel<TestNode> model_;
   TreeView tree_;
 
  private:
   std::string InternalNodeAsString(TreeView::InternalNode* node);
 
   TestNode* GetNodeByTitleImpl(TestNode* node, const base::string16& title);
 
   DISALLOW_COPY_AND_ASSIGN(TreeViewTest);
 };
 
 TestNode* TreeViewTest::Add(TestNode* parent,
                             int index,
                             const std::string& title) {
-  TestNode* new_node = new TestNode;
+  std::unique_ptr<TestNode> new_node = base::MakeUnique<TestNode>();
   new_node->SetTitle(ASCIIToUTF16(title));
-  model_.Add(parent, new_node, index);
-  return new_node;
+  return model_.Add(parent, std::move(new_node), index);
 }
 
 std::string TreeViewTest::TreeViewContentsAsString() {
   return InternalNodeAsString(&tree_.root_);
 }
 
 std::string TreeViewTest::GetSelectedNodeTitle() {
   TreeModelNode* model_node = tree_.GetSelectedNode();
   return model_node ? base::UTF16ToASCII(model_node->GetTitle())
                     : std::string();
@@ skipping 151 matching lines @@
 
   // Remove c11, which shouldn't have any effect on the tree.
   EXPECT_EQ("root [a b c]", TreeViewContentsAsString());
   EXPECT_EQ("root", GetSelectedNodeTitle());
   EXPECT_EQ(4, GetRowCount());
 
   // Expand b1, then collapse it and remove its only child, b1. This shouldn't
   // effect the tree.
   tree_.Expand(GetNodeByTitle("b"));
   tree_.Collapse(GetNodeByTitle("b"));
-  delete model_.Remove(GetNodeByTitle("b1")->parent(), GetNodeByTitle("b1"));
+  model_.Remove(GetNodeByTitle("b1")->parent(), GetNodeByTitle("b1"));
   EXPECT_EQ("root [a b c]", TreeViewContentsAsString());
   EXPECT_EQ("root", GetSelectedNodeTitle());
   EXPECT_EQ(4, GetRowCount());
 
   // Remove 'b'.
-  delete model_.Remove(GetNodeByTitle("b")->parent(), GetNodeByTitle("b"));
+  model_.Remove(GetNodeByTitle("b")->parent(), GetNodeByTitle("b"));
   EXPECT_EQ("root [a c]", TreeViewContentsAsString());
   EXPECT_EQ("root", GetSelectedNodeTitle());
   EXPECT_EQ(3, GetRowCount());
 
   // Remove 'c11', shouldn't visually change anything.
-  delete model_.Remove(GetNodeByTitle("c11")->parent(), GetNodeByTitle("c11"));
+  model_.Remove(GetNodeByTitle("c11")->parent(), GetNodeByTitle("c11"));
   EXPECT_EQ("root [a c]", TreeViewContentsAsString());
   EXPECT_EQ("root", GetSelectedNodeTitle());
   EXPECT_EQ(3, GetRowCount());
 
   // Select 'c1', remove 'c' and make sure selection changes.
   tree_.SetSelectedNode(GetNodeByTitle("c1"));
   EXPECT_EQ("c1", GetSelectedNodeTitle());
-  delete model_.Remove(GetNodeByTitle("c")->parent(), GetNodeByTitle("c"));
+  model_.Remove(GetNodeByTitle("c")->parent(), GetNodeByTitle("c"));
   EXPECT_EQ("root [a]", TreeViewContentsAsString());
   EXPECT_EQ("root", GetSelectedNodeTitle());
   EXPECT_EQ(2, GetRowCount());
 
   tree_.SetRootShown(false);
   // Add 'b' select it and remove it. Because we're not showing the root
   // selection should change to 'a'.
   Add(GetNodeByTitle("root"), 1, "b");
   tree_.SetSelectedNode(GetNodeByTitle("b"));
-  delete model_.Remove(GetNodeByTitle("b")->parent(), GetNodeByTitle("b"));
+  model_.Remove(GetNodeByTitle("b")->parent(), GetNodeByTitle("b"));
   EXPECT_EQ("root [a]", TreeViewContentsAsString());
   EXPECT_EQ("a", GetSelectedNodeTitle());
   EXPECT_EQ(1, GetRowCount());
 }
 
 // Verifies changing a node title works.
 TEST_F(TreeViewTest, TreeNodeChanged) {
   // Add c1 as a child of c and c11 as a child of c1.
   Add(Add(GetNodeByTitle("c"), 0, "c1"), 0, "c11");
   tree_.SetModel(&model_);
@@ skipping 117 matching lines @@
   tree_.SetSelectedNode(GetNodeByTitle("root"));
   ExpandOrSelectChild();
   tree_.SetEditable(true);
   tree_.StartEditing(GetNodeByTitle("a"));
   tree_.editor()->SetText(ASCIIToUTF16("a changed"));
   tree_.OnDidChangeFocus(NULL, NULL);
   EXPECT_TRUE(GetNodeByTitle("a changed") != NULL);
 }
 
 }  // namespace views