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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1198963014: Change ownership of BookmarkClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup_managed_and_supervised_nodes
Patch Set: Rebase Created 5 years, 6 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
« no previous file with comments | « components/bookmarks/browser/bookmark_node_data_unittest.cc ('k') | components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c83ac11e4d7038cfd37efe960b8dbcd21a6e517d..f547092ba4b6114e87c2e17b536aa7b3f19d1662 100644
--- a/components/bookmarks/browser/bookmark_utils_unittest.cc
+++ b/components/bookmarks/browser/bookmark_utils_unittest.cc
@@ -74,8 +74,7 @@ class BookmarkUtilsTest : public testing::Test,
};
TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesWordPhraseQuery) {
- TestBookmarkClient client;
- scoped_ptr<BookmarkModel> model(client.CreateModel());
+ scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
const BookmarkNode* node1 = model->AddURL(model->other_node(),
0,
ASCIIToUTF16("foo bar"),
@@ -132,8 +131,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesWordPhraseQuery) {
// Check exact matching against a URL query.
TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesUrl) {
- TestBookmarkClient client;
- scoped_ptr<BookmarkModel> model(client.CreateModel());
+ scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
const BookmarkNode* node1 = model->AddURL(model->other_node(),
0,
ASCIIToUTF16("Google"),
@@ -168,8 +166,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesUrl) {
// Check exact matching against a title query.
TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesTitle) {
- TestBookmarkClient client;
- scoped_ptr<BookmarkModel> model(client.CreateModel());
+ scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
const BookmarkNode* node1 = model->AddURL(model->other_node(),
0,
ASCIIToUTF16("Google"),
@@ -206,8 +203,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesTitle) {
// Check matching against a query with multiple predicates.
TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesConjunction) {
- TestBookmarkClient client;
- scoped_ptr<BookmarkModel> model(client.CreateModel());
+ scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
const BookmarkNode* node1 = model->AddURL(model->other_node(),
0,
ASCIIToUTF16("Google"),
@@ -258,8 +254,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesConjunction) {
// Copy and paste is not yet supported on iOS. http://crbug.com/228147
#if !defined(OS_IOS)
TEST_F(BookmarkUtilsTest, PasteBookmarkFromURL) {
- TestBookmarkClient client;
- scoped_ptr<BookmarkModel> model(client.CreateModel());
+ scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
const base::string16 url_text = ASCIIToUTF16("http://www.google.com/");
const BookmarkNode* new_folder = model->AddFolder(
model->bookmark_bar_node(), 0, ASCIIToUTF16("New_Folder"));
@@ -288,8 +283,7 @@ TEST_F(BookmarkUtilsTest, PasteBookmarkFromURL) {
}
TEST_F(BookmarkUtilsTest, CopyPaste) {
- TestBookmarkClient client;
- scoped_ptr<BookmarkModel> model(client.CreateModel());
+ scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
const BookmarkNode* node = model->AddURL(model->other_node(),
0,
ASCIIToUTF16("foo bar"),
@@ -317,8 +311,7 @@ TEST_F(BookmarkUtilsTest, CopyPaste) {
// Test for updating title such that url and title pair are unique among the
// children of parent.
TEST_F(BookmarkUtilsTest, MakeTitleUnique) {
- TestBookmarkClient client;
- scoped_ptr<BookmarkModel> model(client.CreateModel());
+ scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
const base::string16 url_text = ASCIIToUTF16("http://www.google.com/");
const base::string16 title_text = ASCIIToUTF16("foobar");
const BookmarkNode* bookmark_bar_node = model->bookmark_bar_node();
@@ -351,8 +344,7 @@ TEST_F(BookmarkUtilsTest, MakeTitleUnique) {
}
TEST_F(BookmarkUtilsTest, CopyPasteMetaInfo) {
- TestBookmarkClient client;
- scoped_ptr<BookmarkModel> model(client.CreateModel());
+ scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
const BookmarkNode* node = model->AddURL(model->other_node(),
0,
ASCIIToUTF16("foo bar"),
@@ -394,8 +386,7 @@ TEST_F(BookmarkUtilsTest, CopyPasteMetaInfo) {
#define MAYBE_CutToClipboard CutToClipboard
#endif
TEST_F(BookmarkUtilsTest, MAYBE_CutToClipboard) {
- TestBookmarkClient client;
- scoped_ptr<BookmarkModel> model(client.CreateModel());
+ scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
model->AddObserver(this);
base::string16 title(ASCIIToUTF16("foo"));
@@ -420,14 +411,12 @@ TEST_F(BookmarkUtilsTest, MAYBE_CutToClipboard) {
}
TEST_F(BookmarkUtilsTest, PasteNonEditableNodes) {
- TestBookmarkClient client;
// Load a model with an extra node that is not editable.
BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
BookmarkPermanentNodeList extra_nodes;
extra_nodes.push_back(extra_node);
- client.SetExtraNodesToLoad(extra_nodes.Pass());
-
- scoped_ptr<BookmarkModel> model(client.CreateModel());
+ scoped_ptr<BookmarkModel> model(
+ TestBookmarkClient::CreateModel(extra_nodes.Pass(), nullptr, false));
const BookmarkNode* node = model->AddURL(model->other_node(),
0,
ASCIIToUTF16("foo bar"),
@@ -448,8 +437,7 @@ TEST_F(BookmarkUtilsTest, PasteNonEditableNodes) {
#endif // !defined(OS_IOS)
TEST_F(BookmarkUtilsTest, GetParentForNewNodes) {
- TestBookmarkClient client;
- scoped_ptr<BookmarkModel> model(client.CreateModel());
+ scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
// This tests the case where selection contains one item and that item is a
// folder.
std::vector<const BookmarkNode*> nodes;
@@ -490,8 +478,7 @@ TEST_F(BookmarkUtilsTest, GetParentForNewNodes) {
// Verifies that meta info is copied when nodes are cloned.
TEST_F(BookmarkUtilsTest, CloneMetaInfo) {
- TestBookmarkClient client;
- scoped_ptr<BookmarkModel> model(client.CreateModel());
+ scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
// Add a node containing meta info.
const BookmarkNode* node = model->AddURL(model->other_node(),
0,
@@ -524,8 +511,7 @@ TEST_F(BookmarkUtilsTest, CloneMetaInfo) {
// Verifies that meta info fields in the non cloned set are not copied when
// cloning a bookmark.
TEST_F(BookmarkUtilsTest, CloneBookmarkResetsNonClonedKey) {
- TestBookmarkClient client;
- scoped_ptr<BookmarkModel> model(client.CreateModel());
+ scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
model->AddNonClonedKey("foo");
const BookmarkNode* parent = model->other_node();
const BookmarkNode* node = model->AddURL(
@@ -550,8 +536,7 @@ TEST_F(BookmarkUtilsTest, CloneBookmarkResetsNonClonedKey) {
// Verifies that meta info fields in the non cloned set are not copied when
// cloning a folder.
TEST_F(BookmarkUtilsTest, CloneFolderResetsNonClonedKey) {
- TestBookmarkClient client;
- scoped_ptr<BookmarkModel> model(client.CreateModel());
+ scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
model->AddNonClonedKey("foo");
const BookmarkNode* parent = model->other_node();
const BookmarkNode* node = model->AddFolder(parent, 0, ASCIIToUTF16("title"));
@@ -573,14 +558,13 @@ TEST_F(BookmarkUtilsTest, CloneFolderResetsNonClonedKey) {
}
TEST_F(BookmarkUtilsTest, RemoveAllBookmarks) {
- TestBookmarkClient client;
// Load a model with an extra node that is not editable.
BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
BookmarkPermanentNodeList extra_nodes;
extra_nodes.push_back(extra_node);
- client.SetExtraNodesToLoad(extra_nodes.Pass());
- scoped_ptr<BookmarkModel> model(client.CreateModel());
+ scoped_ptr<BookmarkModel> model(
+ TestBookmarkClient::CreateModel(extra_nodes.Pass(), nullptr, false));
EXPECT_TRUE(model->bookmark_bar_node()->empty());
EXPECT_TRUE(model->other_node()->empty());
EXPECT_TRUE(model->mobile_node()->empty());
« no previous file with comments | « components/bookmarks/browser/bookmark_node_data_unittest.cc ('k') | components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698