Fix componentization of chrome/browser/bookmarks

chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h

Index: chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h
diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h
index e12850114ae2df565c06836fd80175b487567e22..dc32387c2fa1508c39ace1e150be3d0d297b0f68 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h
+++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h
@@ -11,11 +11,10 @@
 #include "base/basictypes.h"
 #include "chrome/common/extensions/api/bookmarks.h"
 
-class ChromeBookmarkClient;
-
 namespace bookmarks {
 class BookmarkModel;
 class BookmarkNode;
+class ManagedBookmarkService;
 }
 
 // Helper functions.
@@ -24,25 +23,27 @@ namespace bookmark_api_helpers {
 
 // The returned value is owned by the caller.
 api::bookmarks::BookmarkTreeNode* GetBookmarkTreeNode(
-    ChromeBookmarkClient* client,
+    bookmarks::ManagedBookmarkService* managed,
     const bookmarks::BookmarkNode* node,
     bool recurse,
     bool only_folders);
 
-// Add a JSON representation of |node| to the JSON |nodes|.
-void AddNode(ChromeBookmarkClient* client,
+// Adds a JSON representation of |node| to the JSON |nodes|.
+void AddNode(bookmarks::ManagedBookmarkService* managed,
              const bookmarks::BookmarkNode* node,
-             std::vector<linked_ptr<api::bookmarks::BookmarkTreeNode> >* nodes,
+             std::vector<linked_ptr<api::bookmarks::BookmarkTreeNode>>* nodes,
              bool recurse);
 
-void AddNodeFoldersOnly(ChromeBookmarkClient* client,
-                        const bookmarks::BookmarkNode* node,
-                        std::vector<linked_ptr<
-                            api::bookmarks::BookmarkTreeNode> >* nodes,
-                        bool recurse);
+// Adds a JSON representation of |node| of folder type to the JSON |nodes|.
+void AddNodeFoldersOnly(
+    bookmarks::ManagedBookmarkService* managed,
+    const bookmarks::BookmarkNode* node,
+    std::vector<linked_ptr<api::bookmarks::BookmarkTreeNode>>* nodes,
+    bool recurse);
 
+// Remove node of |id|.
 bool RemoveNode(bookmarks::BookmarkModel* model,
-                ChromeBookmarkClient* client,
+                bookmarks::ManagedBookmarkService* managed,
                 int64 id,
                 bool recursive,
                 std::string* error);