Commit 9da96124 authored by noyau's avatar noyau Committed by Commit bot

Fixing the enhanced bookmark namespace.

BUG=None

Review URL: https://codereview.chromium.org/456793002

Cr-Commit-Position: refs/heads/master@{#292150}
parent fd2e0b81
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_model.h"
#include "ui/base/models/tree_node_iterator.h" #include "ui/base/models/tree_node_iterator.h"
namespace enhanced_bookmark_utils { namespace enhanced_bookmarks {
std::vector<const BookmarkNode*> FindBookmarksWithQuery( std::vector<const BookmarkNode*> FindBookmarksWithQuery(
BookmarkModel* bookmark_model, BookmarkModel* bookmark_model,
...@@ -124,4 +124,4 @@ const BookmarkNode* RootLevelFolderForNode(const BookmarkNode* node, ...@@ -124,4 +124,4 @@ const BookmarkNode* RootLevelFolderForNode(const BookmarkNode* node,
return top; return top;
} }
} // namespace enhanced_bookmark_utils } // namespace enhanced_bookmarks
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
class BookmarkModel; class BookmarkModel;
class BookmarkNode; class BookmarkNode;
namespace enhanced_bookmark_utils { namespace enhanced_bookmarks {
// Returns an ordered vector of bookmarks that are urls that match |query|. // Returns an ordered vector of bookmarks that are urls that match |query|.
// |query| must be UTF8 encoded. // |query| must be UTF8 encoded.
...@@ -44,6 +44,6 @@ bool IsPrimaryPermanentNode(const BookmarkNode* node, BookmarkModel* model); ...@@ -44,6 +44,6 @@ bool IsPrimaryPermanentNode(const BookmarkNode* node, BookmarkModel* model);
const BookmarkNode* RootLevelFolderForNode(const BookmarkNode* node, const BookmarkNode* RootLevelFolderForNode(const BookmarkNode* node,
BookmarkModel* model); BookmarkModel* model);
} // namespace enhanced_bookmark_utils } // namespace enhanced_bookmarks
#endif // COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_UTILS_H_ #endif // COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_UTILS_H_
...@@ -42,8 +42,7 @@ TEST_F(EnhancedBookmarkUtilsTest, TestBookmarkSearch) { ...@@ -42,8 +42,7 @@ TEST_F(EnhancedBookmarkUtilsTest, TestBookmarkSearch) {
const BookmarkNode* node5 = AddBookmark(bookmark_model.get(), "jo hn"); const BookmarkNode* node5 = AddBookmark(bookmark_model.get(), "jo hn");
std::vector<const BookmarkNode*> result = std::vector<const BookmarkNode*> result =
enhanced_bookmark_utils::FindBookmarksWithQuery(bookmark_model.get(), enhanced_bookmarks::FindBookmarksWithQuery(bookmark_model.get(), "john");
"john");
ASSERT_EQ(result.size(), 3u); ASSERT_EQ(result.size(), 3u);
CHECK(std::find(result.begin(), result.end(), node1) != result.end()); CHECK(std::find(result.begin(), result.end(), node1) != result.end());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment