Fix componentization of chrome/browser/bookmarks

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_BOOKMARKS_BOOKMARKS_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_BOOKMARKS_BOOKMARKS_API_H_
 
 #include <list>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_node.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #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;
 }
 
 namespace extensions {
 
 namespace api {
 namespace bookmarks {
 struct CreateDetails;
 }
@@ skipping 36 matching lines @@
       bookmarks::BookmarkModel* model) override;
   void ExtensiveBookmarkChangesEnded(bookmarks::BookmarkModel* model) override;
 
  private:
   // Helper to actually dispatch an event to extension listeners.
   void DispatchEvent(const std::string& event_name,
                      scoped_ptr<base::ListValue> event_args);
 
   content::BrowserContext* browser_context_;
   bookmarks::BookmarkModel* model_;
-  ChromeBookmarkClient* client_;
+  bookmarks::ManagedBookmarkService* managed_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkEventRouter);
 };
 
 class BookmarksAPI : public BrowserContextKeyedAPI,
                      public EventRouter::Observer {
  public:
   explicit BookmarksAPI(content::BrowserContext* context);
   ~BookmarksAPI() override;
 
@@ skipping 29 matching lines @@
 
  protected:
   ~BookmarksFunction() override {}
 
   // RunAsync semantic equivalent called when the bookmarks are ready.
   virtual bool RunOnReady() = 0;
 
   // 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
   // as an int64. In case of error, doesn't change id and returns false.
   bool GetBookmarkIdAsInt64(const std::string& id_string, int64* id);
 
   // Helper to get the bookmark node from a given string id.
   // If the given id can't be parsed or doesn't refer to a valid node, sets
   // error_ and returns NULL.
   const bookmarks::BookmarkNode* GetBookmarkNodeFromId(
@@ skipping 213 matching lines @@
  private:
   ~BookmarksExportFunction() override {}
 
   // BookmarksFunction:
   bool RunOnReady() override;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_BOOKMARKS_BOOKMARKS_API_H_