Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Unified Diff: components/bookmarks/browser/bookmark_utils_unittest.cc

Issue 2379863002: Fix object ownership in ui/base/models. (Closed)
Patch Set: fix Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/bookmarks/browser/bookmark_utils_unittest.cc
diff --git a/components/bookmarks/browser/bookmark_utils_unittest.cc b/components/bookmarks/browser/bookmark_utils_unittest.cc
index dfd6e435a5e90aa9d1df25244a3d068076f42213..d78e9fcebed4a2deed72f4392fab44c0b6971df1 100644
--- a/components/bookmarks/browser/bookmark_utils_unittest.cc
+++ b/components/bookmarks/browser/bookmark_utils_unittest.cc
@@ -9,6 +9,7 @@
#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"
@@ -417,9 +418,9 @@ TEST_F(BookmarkUtilsTest, MAYBE_CutToClipboard) {
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(
@@ -568,9 +569,9 @@ TEST_F(BookmarkUtilsTest, CloneFolderResetsNonClonedKey) {
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(
« no previous file with comments | « components/bookmarks/browser/bookmark_storage.cc ('k') | components/bookmarks/managed/managed_bookmark_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698