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

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

Issue 562693002: Move TestBookmarkClient into bookmarks namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix enhanced_bookmarks Created 6 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 75daeebb6c668562c9f6a2df424c6139382f0f58..ace715a25d5ca7c24a07014165aa7af79eabd258 100644
--- a/components/bookmarks/browser/bookmark_utils_unittest.cc
+++ b/components/bookmarks/browser/bookmark_utils_unittest.cc
@@ -74,7 +74,7 @@ class BookmarkUtilsTest : public testing::Test,
};
TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesWordPhraseQuery) {
- test::TestBookmarkClient client;
+ TestBookmarkClient client;
scoped_ptr<BookmarkModel> model(client.CreateModel());
const BookmarkNode* node1 = model->AddURL(model->other_node(),
0,
@@ -132,7 +132,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesWordPhraseQuery) {
// Check exact matching against a URL query.
TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesUrl) {
- test::TestBookmarkClient client;
+ TestBookmarkClient client;
scoped_ptr<BookmarkModel> model(client.CreateModel());
const BookmarkNode* node1 = model->AddURL(model->other_node(),
0,
@@ -168,7 +168,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesUrl) {
// Check exact matching against a title query.
TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesTitle) {
- test::TestBookmarkClient client;
+ TestBookmarkClient client;
scoped_ptr<BookmarkModel> model(client.CreateModel());
const BookmarkNode* node1 = model->AddURL(model->other_node(),
0,
@@ -206,7 +206,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesTitle) {
// Check matching against a query with multiple predicates.
TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesConjunction) {
- test::TestBookmarkClient client;
+ TestBookmarkClient client;
scoped_ptr<BookmarkModel> model(client.CreateModel());
const BookmarkNode* node1 = model->AddURL(model->other_node(),
0,
@@ -258,7 +258,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, CopyPaste) {
- test::TestBookmarkClient client;
+ TestBookmarkClient client;
scoped_ptr<BookmarkModel> model(client.CreateModel());
const BookmarkNode* node = model->AddURL(model->other_node(),
0,
@@ -286,7 +286,7 @@ TEST_F(BookmarkUtilsTest, CopyPaste) {
}
TEST_F(BookmarkUtilsTest, CopyPasteMetaInfo) {
- test::TestBookmarkClient client;
+ TestBookmarkClient client;
scoped_ptr<BookmarkModel> model(client.CreateModel());
const BookmarkNode* node = model->AddURL(model->other_node(),
0,
@@ -329,7 +329,7 @@ TEST_F(BookmarkUtilsTest, CopyPasteMetaInfo) {
#define MAYBE_CutToClipboard CutToClipboard
#endif
TEST_F(BookmarkUtilsTest, MAYBE_CutToClipboard) {
- test::TestBookmarkClient client;
+ TestBookmarkClient client;
scoped_ptr<BookmarkModel> model(client.CreateModel());
model->AddObserver(this);
@@ -355,7 +355,7 @@ TEST_F(BookmarkUtilsTest, MAYBE_CutToClipboard) {
}
TEST_F(BookmarkUtilsTest, PasteNonEditableNodes) {
- test::TestBookmarkClient client;
+ TestBookmarkClient client;
// Load a model with an extra node that is not editable.
BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
BookmarkPermanentNodeList extra_nodes;
@@ -384,7 +384,7 @@ TEST_F(BookmarkUtilsTest, PasteNonEditableNodes) {
#endif // !defined(OS_IOS)
TEST_F(BookmarkUtilsTest, GetParentForNewNodes) {
- test::TestBookmarkClient client;
+ TestBookmarkClient client;
scoped_ptr<BookmarkModel> model(client.CreateModel());
// This tests the case where selection contains one item and that item is a
// folder.
@@ -426,7 +426,7 @@ TEST_F(BookmarkUtilsTest, GetParentForNewNodes) {
// Verifies that meta info is copied when nodes are cloned.
TEST_F(BookmarkUtilsTest, CloneMetaInfo) {
- test::TestBookmarkClient client;
+ TestBookmarkClient client;
scoped_ptr<BookmarkModel> model(client.CreateModel());
// Add a node containing meta info.
const BookmarkNode* node = model->AddURL(model->other_node(),
@@ -458,7 +458,7 @@ TEST_F(BookmarkUtilsTest, CloneMetaInfo) {
}
TEST_F(BookmarkUtilsTest, RemoveAllBookmarks) {
- test::TestBookmarkClient client;
+ TestBookmarkClient client;
// Load a model with an extra node that is not editable.
BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
BookmarkPermanentNodeList extra_nodes;
« no previous file with comments | « components/bookmarks/browser/bookmark_node_data_unittest.cc ('k') | components/bookmarks/test/test_bookmark_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698