Fix object ownership in ui/base/models.

components/bookmarks/browser/bookmark_utils_unittest.cc

 // Copyright 2014 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 "components/bookmarks/browser/bookmark_utils.h"
 
 #include <stddef.h>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_node_data.h"
 #include "components/bookmarks/test/test_bookmark_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
@@ skipping 388 matching lines @@
   // Make sure observers were notified the set of changes should be grouped.
   ExpectGroupedChangeCount(1, 1);
 
   // And make sure we can paste from the clipboard.
   EXPECT_TRUE(CanPasteFromClipboard(model.get(), model->other_node()));
 }
 
 TEST_F(BookmarkUtilsTest, PasteNonEditableNodes) {
   // Load a model with an extra node that is not editable.
   std::unique_ptr<TestBookmarkClient> client(new TestBookmarkClient());
-  BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
   BookmarkPermanentNodeList extra_nodes;
-  extra_nodes.push_back(extra_node);
+  extra_nodes.push_back(base::MakeUnique<BookmarkPermanentNode>(100));
+  BookmarkPermanentNode* extra_node = extra_nodes.back().get();
   client->SetExtraNodesToLoad(std::move(extra_nodes));
 
   std::unique_ptr<BookmarkModel> model(
       TestBookmarkClient::CreateModelWithClient(std::move(client)));
   const BookmarkNode* node = model->AddURL(model->other_node(),
                                            0,
                                            ASCIIToUTF16("foo bar"),
                                            GURL("http://www.google.com"));
 
   // Copy a node to the clipboard.
@@ skipping 128 matching lines @@
   EXPECT_FALSE(parent->GetChild(0)->GetMetaInfo("foo", &value));
 
   // Other keys should still be cloned.
   EXPECT_TRUE(parent->GetChild(0)->GetMetaInfo("bar", &value));
   EXPECT_EQ("kept value", value);
 }
 
 TEST_F(BookmarkUtilsTest, RemoveAllBookmarks) {
   // Load a model with an extra node that is not editable.
   std::unique_ptr<TestBookmarkClient> client(new TestBookmarkClient());
-  BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
   BookmarkPermanentNodeList extra_nodes;
-  extra_nodes.push_back(extra_node);
+  extra_nodes.push_back(base::MakeUnique<BookmarkPermanentNode>(100));
+  BookmarkPermanentNode* extra_node = extra_nodes.back().get();
   client->SetExtraNodesToLoad(std::move(extra_nodes));
 
   std::unique_ptr<BookmarkModel> model(
       TestBookmarkClient::CreateModelWithClient(std::move(client)));
   EXPECT_TRUE(model->bookmark_bar_node()->empty());
   EXPECT_TRUE(model->other_node()->empty());
   EXPECT_TRUE(model->mobile_node()->empty());
   EXPECT_TRUE(extra_node->empty());
 
   const base::string16 title = base::ASCIIToUTF16("Title");
@@ skipping 13 matching lines @@
   model->GetNodesByURL(url, &nodes);
   ASSERT_EQ(1u, nodes.size());
   EXPECT_TRUE(model->bookmark_bar_node()->empty());
   EXPECT_TRUE(model->other_node()->empty());
   EXPECT_TRUE(model->mobile_node()->empty());
   EXPECT_EQ(1, extra_node->child_count());
 }
 
 }  // namespace
 }  // namespace bookmarks