Index: components/bookmarks/browser/bookmark_model_unittest.cc |
diff --git a/components/bookmarks/browser/bookmark_model_unittest.cc b/components/bookmarks/browser/bookmark_model_unittest.cc |
index 15dff7c26ac6497c218e7dabb18f3625f26b147c..1ee3554e3cf0773b44bb6e163cc9776d25cc22aa 100644 |
--- a/components/bookmarks/browser/bookmark_model_unittest.cc |
+++ b/components/bookmarks/browser/bookmark_model_unittest.cc |
@@ -265,7 +265,7 @@ class BookmarkModelTest : public testing::Test, |
BookmarkPermanentNode* ReloadModelWithExtraNode() { |
BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100); |
- bookmarks::BookmarkPermanentNodeList extra_nodes; |
+ BookmarkPermanentNodeList extra_nodes; |
extra_nodes.push_back(extra_node); |
client_.SetExtraNodesToLoad(extra_nodes.Pass()); |
@@ -722,15 +722,14 @@ TEST_F(BookmarkModelTest, MostRecentlyModifiedFolders) { |
// Make sure folder is in the most recently modified. |
std::vector<const BookmarkNode*> most_recent_folders = |
- bookmarks::GetMostRecentlyModifiedUserFolders(model_.get(), 1); |
+ GetMostRecentlyModifiedUserFolders(model_.get(), 1); |
ASSERT_EQ(1U, most_recent_folders.size()); |
ASSERT_EQ(folder, most_recent_folders[0]); |
// Nuke the folder and do another fetch, making sure folder isn't in the |
// returned list. |
model_->Remove(folder->parent(), 0); |
- most_recent_folders = |
- bookmarks::GetMostRecentlyModifiedUserFolders(model_.get(), 1); |
+ most_recent_folders = GetMostRecentlyModifiedUserFolders(model_.get(), 1); |
ASSERT_EQ(1U, most_recent_folders.size()); |
ASSERT_TRUE(most_recent_folders[0] != folder); |
} |
@@ -763,7 +762,7 @@ TEST_F(BookmarkModelTest, MostRecentlyAddedEntries) { |
// Make sure order is honored. |
std::vector<const BookmarkNode*> recently_added; |
- bookmarks::GetMostRecentlyAddedEntries(model_.get(), 2, &recently_added); |
+ GetMostRecentlyAddedEntries(model_.get(), 2, &recently_added); |
ASSERT_EQ(2U, recently_added.size()); |
ASSERT_TRUE(n1 == recently_added[0]); |
ASSERT_TRUE(n2 == recently_added[1]); |
@@ -771,7 +770,7 @@ TEST_F(BookmarkModelTest, MostRecentlyAddedEntries) { |
// swap 1 and 2, then check again. |
recently_added.clear(); |
SwapDateAdded(n1, n2); |
- bookmarks::GetMostRecentlyAddedEntries(model_.get(), 4, &recently_added); |
+ GetMostRecentlyAddedEntries(model_.get(), 4, &recently_added); |
ASSERT_EQ(4U, recently_added.size()); |
ASSERT_TRUE(n2 == recently_added[0]); |
ASSERT_TRUE(n1 == recently_added[1]); |
@@ -1129,12 +1128,9 @@ TEST_F(BookmarkModelTest, IsBookmarked) { |
EXPECT_TRUE(model_->IsBookmarked(GURL("http://youtube.com"))); |
EXPECT_FALSE(model_->IsBookmarked(GURL("http://reddit.com"))); |
- EXPECT_TRUE( |
- bookmarks::IsBookmarkedByUser(model_.get(), GURL("http://google.com"))); |
- EXPECT_FALSE( |
- bookmarks::IsBookmarkedByUser(model_.get(), GURL("http://youtube.com"))); |
- EXPECT_FALSE( |
- bookmarks::IsBookmarkedByUser(model_.get(), GURL("http://reddit.com"))); |
+ EXPECT_TRUE(IsBookmarkedByUser(model_.get(), GURL("http://google.com"))); |
+ EXPECT_FALSE(IsBookmarkedByUser(model_.get(), GURL("http://youtube.com"))); |
+ EXPECT_FALSE(IsBookmarkedByUser(model_.get(), GURL("http://reddit.com"))); |
} |
// Verifies that GetMostRecentlyAddedUserNodeForURL skips bookmarks that |