Introduce BookmarkClient interface to abstract embedder

chrome/browser/bookmarks/bookmark_storage.h

Index: chrome/browser/bookmarks/bookmark_storage.h
diff --git a/chrome/browser/bookmarks/bookmark_storage.h b/chrome/browser/bookmarks/bookmark_storage.h
index ce6cc7c95de1b3d2b9f7ac2091a76c8a034e8c3d..ad6bc14387b8d846cd002b4e860a698cc62b58b3 100644
--- a/chrome/browser/bookmarks/bookmark_storage.h
+++ b/chrome/browser/bookmarks/bookmark_storage.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_STORAGE_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_STORAGE_H_
 
+#include "base/files/file_path.h"
 #include "base/files/important_file_writer.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -18,10 +19,6 @@ namespace base {
 class SequencedTaskRunner;
 }
 
-namespace content {
-class BrowserContext;
-}
-
 // BookmarkLoadDetails is used by BookmarkStorage when loading bookmarks.
 // BookmarkModel creates a BookmarkLoadDetails and passes it (including
 // ownership) to BookmarkStorage. BookmarkStorage loads the bookmarks (and
@@ -117,13 +114,13 @@ class BookmarkStorage : public base::ImportantFileWriter::DataSerializer,
                         public base::RefCountedThreadSafe<BookmarkStorage> {
  public:
   // Creates a BookmarkStorage for the specified model
-  BookmarkStorage(content::BrowserContext* context,
-                  BookmarkModel* model,
+  BookmarkStorage(BookmarkModel* model,
+                  const base::FilePath& profile_path,
                   base::SequencedTaskRunner* sequenced_task_runner);
 
   // Loads the bookmarks into the model, notifying the model when done. This
   // takes ownership of |details|. See BookmarkLoadDetails for details.
-  void LoadBookmarks(BookmarkLoadDetails* details);
+  void LoadBookmarks(BookmarkClient* client, BookmarkLoadDetails* details);
 
   // Schedules saving the bookmark bar model to disk.
   void ScheduleSave();