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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc

Issue 2379863002: Fix object ownership in ui/base/models. (Closed)
Patch Set: stray debugging line 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
« chrome/browser/android/bookmarks/partner_bookmarks_reader.cc ('K') | « chrome/browser/android/bookmarks/partner_bookmarks_reader.cc ('k') | chrome/browser/browsing_data/cookies_tree_model.h » ('j') | components/bookmarks/browser/bookmark_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc b/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
index 3d84a52cb8e526feb0617b19bf4e01c92fa34af2..6625c0e4dbd02763382c01714f12b7c18abe109b 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
@@ -7,6 +7,7 @@
#include <stdint.h>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ -91,21 +92,25 @@ TEST_F(PartnerBookmarksShimTest, GetNodeByID) {
BookmarkNode* root_partner_node = new BookmarkPermanentNode(0);
BookmarkNode* partner_folder1 = new BookmarkNode(1, GURL());
Bernhard Bauer 2016/09/30 08:58:44 Can we make this a unique_ptr<> as well?
Avi (use Gerrit) 2016/09/30 16:10:12 Done.
partner_folder1->set_type(BookmarkNode::FOLDER);
- root_partner_node->Add(partner_folder1, root_partner_node->child_count());
+ root_partner_node->Add(base::WrapUnique(partner_folder1),
+ root_partner_node->child_count());
BookmarkNode* partner_folder2 = new BookmarkNode(2, GURL());
partner_folder2->set_type(BookmarkNode::FOLDER);
- partner_folder1->Add(partner_folder2, partner_folder1->child_count());
+ partner_folder1->Add(base::WrapUnique(partner_folder2),
+ partner_folder1->child_count());
BookmarkNode* partner_bookmark1 = new BookmarkNode(3,
GURL("http://www.a.com"));
partner_bookmark1->set_type(BookmarkNode::URL);
- partner_folder1->Add(partner_bookmark1, partner_folder1->child_count());
+ partner_folder1->Add(base::WrapUnique(partner_bookmark1),
+ partner_folder1->child_count());
BookmarkNode* partner_bookmark2 = new BookmarkNode(4,
GURL("http://www.b.com"));
partner_bookmark2->set_type(BookmarkNode::URL);
- partner_folder2->Add(partner_bookmark2, partner_folder2->child_count());
+ partner_folder2->Add(base::WrapUnique(partner_bookmark2),
+ partner_folder2->child_count());
PartnerBookmarksShim* shim = partner_bookmarks_shim();
ASSERT_FALSE(shim->IsLoaded());
@@ -134,7 +139,8 @@ TEST_F(PartnerBookmarksShimTest, ObserverNotifiedOfLoadWithPartnerBookmarks) {
BookmarkNode* partner_bookmark1 = new BookmarkNode(id++,
GURL("http://www.a.com"));
partner_bookmark1->set_type(BookmarkNode::URL);
- root_partner_node->Add(partner_bookmark1, root_partner_node->child_count());
+ root_partner_node->Add(base::WrapUnique(partner_bookmark1),
+ root_partner_node->child_count());
PartnerBookmarksShim* shim = partner_bookmarks_shim();
shim->AddObserver(&observer_);
@@ -155,30 +161,36 @@ TEST_F(PartnerBookmarksShimTest, RemoveBookmarks) {
BookmarkNode* partner_folder1 = new BookmarkNode(1, GURL("http://www.a.net"));
partner_folder1->set_type(BookmarkNode::FOLDER);
- root_partner_node->Add(partner_folder1, root_partner_node->child_count());
+ root_partner_node->Add(base::WrapUnique(partner_folder1),
+ root_partner_node->child_count());
BookmarkNode* partner_folder2 = new BookmarkNode(2, GURL("http://www.b.net"));
partner_folder2->set_type(BookmarkNode::FOLDER);
- root_partner_node->Add(partner_folder2, root_partner_node->child_count());
+ root_partner_node->Add(base::WrapUnique(partner_folder2),
+ root_partner_node->child_count());
BookmarkNode* partner_bookmark1 = new BookmarkNode(3,
GURL("http://www.a.com"));
partner_bookmark1->set_type(BookmarkNode::URL);
- partner_folder1->Add(partner_bookmark1, partner_folder1->child_count());
+ partner_folder1->Add(base::WrapUnique(partner_bookmark1),
+ partner_folder1->child_count());
BookmarkNode* partner_bookmark2 = new BookmarkNode(4,
GURL("http://www.b.com"));
partner_bookmark2->set_type(BookmarkNode::URL);
- partner_folder2->Add(partner_bookmark2, partner_folder2->child_count());
+ partner_folder2->Add(base::WrapUnique(partner_bookmark2),
+ partner_folder2->child_count());
BookmarkNode* partner_folder3 = new BookmarkNode(5, GURL("http://www.c.net"));
partner_folder3->set_type(BookmarkNode::FOLDER);
- partner_folder2->Add(partner_folder3, partner_folder2->child_count());
+ partner_folder2->Add(base::WrapUnique(partner_folder3),
+ partner_folder2->child_count());
BookmarkNode* partner_bookmark3 = new BookmarkNode(6,
GURL("http://www.c.com"));
partner_bookmark3->set_type(BookmarkNode::URL);
- partner_folder3->Add(partner_bookmark3, partner_folder3->child_count());
+ partner_folder3->Add(base::WrapUnique(partner_bookmark3),
+ partner_folder3->child_count());
ASSERT_FALSE(shim->IsLoaded());
EXPECT_CALL(observer_, PartnerShimLoaded(shim)).Times(1);
@@ -245,24 +257,28 @@ TEST_F(PartnerBookmarksShimTest, RenameBookmarks) {
BookmarkNode* partner_folder1 = new BookmarkNode(1, GURL("http://www.a.net"));
partner_folder1->set_type(BookmarkNode::FOLDER);
partner_folder1->SetTitle(base::ASCIIToUTF16("a.net"));
- root_partner_node->Add(partner_folder1, root_partner_node->child_count());
+ root_partner_node->Add(base::WrapUnique(partner_folder1),
+ root_partner_node->child_count());
BookmarkNode* partner_folder2 = new BookmarkNode(2, GURL("http://www.b.net"));
partner_folder2->set_type(BookmarkNode::FOLDER);
partner_folder2->SetTitle(base::ASCIIToUTF16("b.net"));
- root_partner_node->Add(partner_folder2, root_partner_node->child_count());
+ root_partner_node->Add(base::WrapUnique(partner_folder2),
+ root_partner_node->child_count());
BookmarkNode* partner_bookmark1 = new BookmarkNode(3,
GURL("http://www.a.com"));
partner_bookmark1->set_type(BookmarkNode::URL);
partner_bookmark1->SetTitle(base::ASCIIToUTF16("a.com"));
- partner_folder1->Add(partner_bookmark1, partner_folder1->child_count());
+ partner_folder1->Add(base::WrapUnique(partner_bookmark1),
+ partner_folder1->child_count());
BookmarkNode* partner_bookmark2 = new BookmarkNode(4,
GURL("http://www.b.com"));
partner_bookmark2->set_type(BookmarkNode::URL);
partner_bookmark2->SetTitle(base::ASCIIToUTF16("b.com"));
- partner_folder2->Add(partner_bookmark2, partner_folder2->child_count());
+ partner_folder2->Add(base::WrapUnique(partner_bookmark2),
+ partner_folder2->child_count());
ASSERT_FALSE(shim->IsLoaded());
EXPECT_CALL(observer_, PartnerShimLoaded(shim)).Times(1);
@@ -330,19 +346,22 @@ TEST_F(PartnerBookmarksShimTest, SaveLoadProfile) {
BookmarkNode* partner_folder1 = new BookmarkNode(1, GURL("http://a.net"));
partner_folder1->set_type(BookmarkNode::FOLDER);
partner_folder1->SetTitle(base::ASCIIToUTF16("a.net"));
- root_partner_node->Add(partner_folder1, root_partner_node->child_count());
+ root_partner_node->Add(base::WrapUnique(partner_folder1),
+ root_partner_node->child_count());
BookmarkNode* partner_bookmark1 = new BookmarkNode(3,
GURL("http://a.com"));
partner_bookmark1->set_type(BookmarkNode::URL);
partner_bookmark1->SetTitle(base::ASCIIToUTF16("a.com"));
- partner_folder1->Add(partner_bookmark1, partner_folder1->child_count());
+ partner_folder1->Add(base::WrapUnique(partner_bookmark1),
+ partner_folder1->child_count());
BookmarkNode* partner_bookmark2 = new BookmarkNode(5,
GURL("http://b.com"));
partner_bookmark2->set_type(BookmarkNode::URL);
partner_bookmark2->SetTitle(base::ASCIIToUTF16("b.com"));
- partner_folder1->Add(partner_bookmark2, partner_folder1->child_count());
+ partner_folder1->Add(base::WrapUnique(partner_bookmark2),
+ partner_folder1->child_count());
ASSERT_FALSE(shim->IsLoaded());
EXPECT_CALL(observer_, PartnerShimLoaded(shim)).Times(1);
@@ -387,12 +406,14 @@ TEST_F(PartnerBookmarksShimTest, DisableEditing) {
BookmarkNode* partner_bookmark1 = new BookmarkNode(3, GURL("http://a"));
partner_bookmark1->set_type(BookmarkNode::URL);
partner_bookmark1->SetTitle(base::ASCIIToUTF16("a"));
- root_partner_node->Add(partner_bookmark1, root_partner_node->child_count());
+ root_partner_node->Add(base::WrapUnique(partner_bookmark1),
+ root_partner_node->child_count());
BookmarkNode* partner_bookmark2 = new BookmarkNode(3, GURL("http://b"));
partner_bookmark2->set_type(BookmarkNode::URL);
partner_bookmark2->SetTitle(base::ASCIIToUTF16("b"));
- root_partner_node->Add(partner_bookmark2, root_partner_node->child_count());
+ root_partner_node->Add(base::WrapUnique(partner_bookmark2),
+ root_partner_node->child_count());
ASSERT_FALSE(shim->IsLoaded());
EXPECT_CALL(observer_, PartnerShimLoaded(shim)).Times(1);
« chrome/browser/android/bookmarks/partner_bookmarks_reader.cc ('K') | « chrome/browser/android/bookmarks/partner_bookmarks_reader.cc ('k') | chrome/browser/browsing_data/cookies_tree_model.h » ('j') | components/bookmarks/browser/bookmark_model.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698