bookmarks: Move BookmarkModel into 'bookmarks' namespace.

BUG=370433
TEST=unit_tests, components_unittests
R=sky@chromium.org
TBR=joaodasilva@chromium.org (for components/policy)

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

Cr-Commit-Position: refs/heads/master@{#311074}

1 files changed, 11 insertions, 5 deletions

diff --git a/components/enhanced_bookmarks/enhanced_bookmark_utils.h b/components/enhanced_bookmarks/enhanced_bookmark_utils.h
index 23d7004..413ef03 100644
--- a/components/enhanced_bookmarks/enhanced_bookmark_utils.h
+++ b/components/enhanced_bookmarks/enhanced_bookmark_utils.h
@@ -9,9 +9,12 @@
 #include <string>
 #include <vector>
 
-class BookmarkModel;
 class BookmarkNode;
 
+namespace bookmarks {
+class BookmarkModel;
+}
+
 namespace enhanced_bookmarks {
 
 // The vector is sorted in place.
@@ -21,22 +24,25 @@ void SortBookmarksByName(std::vector<const BookmarkNode*>& nodes);
 // Returns the permanent nodes whose url children are considered uncategorized
 // and whose folder children should be shown in the bookmark menu.
 // |model| must be loaded.
-std::vector<const BookmarkNode*> PrimaryPermanentNodes(BookmarkModel* model);
+std::vector<const BookmarkNode*> PrimaryPermanentNodes(
+    bookmarks::BookmarkModel* model);
 
 // Returns an unsorted vector of folders that are considered to be at the "root"
 // level of the bookmark hierarchy. Functionally, this means all direct
 // descendants of PrimaryPermanentNodes, and possibly a node for the bookmarks
 // bar.
-std::vector<const BookmarkNode*> RootLevelFolders(BookmarkModel* model);
+std::vector<const BookmarkNode*> RootLevelFolders(
+    bookmarks::BookmarkModel* model);
 
 // Returns whether |node| is a primary permanent node in the sense of
 // |PrimaryPermanentNodes|.
-bool IsPrimaryPermanentNode(const BookmarkNode* node, BookmarkModel* model);
+bool IsPrimaryPermanentNode(const BookmarkNode* node,
+                            bookmarks::BookmarkModel* model);
 
 // Returns the root level folder in which this node is directly, or indirectly
 // via subfolders, located.
 const BookmarkNode* RootLevelFolderForNode(const BookmarkNode* node,
-                                           BookmarkModel* model);
+                                           bookmarks::BookmarkModel* model);
 
 }  // namespace enhanced_bookmarks