Fix componentization of chrome/browser/bookmarks

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

Index: chrome/browser/extensions/api/bookmarks/bookmarks_api.h
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h
index 2ea2857fc65aecd2a2bf67eb68c8ad02f52c0e41..f25e7eaa74154c2d8629680917c4f78e4b4ce4b8 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h
+++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h
@@ -18,13 +18,16 @@
 #include "extensions/browser/event_router.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
-class ChromeBookmarkClient;
-
 namespace base {
 class FilePath;
 class ListValue;
 }
 
+namespace bookmarks {
+class BookmarkModel;
+class ManagedBookmarkService;
+}
+
 namespace content {
 class BrowserContext;
 }
@@ -82,7 +85,7 @@ class BookmarkEventRouter : public bookmarks::BookmarkModelObserver {
 
   content::BrowserContext* browser_context_;
   bookmarks::BookmarkModel* model_;
-  ChromeBookmarkClient* client_;
+  bookmarks::ManagedBookmarkService* managed_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkEventRouter);
 };
@@ -132,8 +135,8 @@ class BookmarksFunction : public ChromeAsyncExtensionFunction,
   // Helper to get the BookmarkModel.
   bookmarks::BookmarkModel* GetBookmarkModel();
 
-  // Helper to get the ChromeBookmarkClient.
-  ChromeBookmarkClient* GetChromeBookmarkClient();
+  // Helper to get the ManagedBookmarkService.
+  bookmarks::ManagedBookmarkService* GetManagedBookmarkService();
 
   // Helper to get the bookmark id as int64 from the given string id.
   // Sets error_ to an error string if the given id string can't be parsed