Introduce BookmarkClient interface to abstract embedder

chrome/browser/bookmarks/bookmark_storage.h

 // Copyright (c) 2011 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_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"
 #include "components/bookmarks/core/browser/bookmark_node.h"
 
 class BookmarkIndex;
 class BookmarkModel;
 
 namespace base {
 class SequencedTaskRunner;
@@ skipping 90 matching lines @@
 };
 
 // BookmarkStorage handles reading/write the bookmark bar model. The
 // BookmarkModel uses the BookmarkStorage to load bookmarks from disk, as well
 // as notifying the BookmarkStorage every time the model changes.
 //
 // Internally BookmarkStorage uses BookmarkCodec to do the actual read/write.
 class BookmarkStorage : public base::ImportantFileWriter::DataSerializer,
                         public base::RefCountedThreadSafe<BookmarkStorage> {
  public:
-  // Creates a BookmarkStorage for the specified model
-  BookmarkStorage(content::BrowserContext* context,
-                  BookmarkModel* model,
+  // Creates a BookmarkStorage for the specified model. The data will be loaded
+  // from and saved to a location derived from |profile_path|. The IO code will
+  // be executed as a task in |sequenced_task_runner|.
+  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);
+  // takes ownership of |details| and send the |OnLoadFinished| callback from
+  // a task in |task_runner|. See BookmarkLoadDetails for details.
+  void LoadBookmarks(
+      BookmarkLoadDetails* details,

[sky, 2014/04/23 20:32:07]

Can you make this take a scoped_ptr?

[sdefresne, 2014/04/24 12:30:15]

Done.

+      const scoped_refptr<base::SequencedTaskRunner>& task_runner);
 
   // Schedules saving the bookmark bar model to disk.
   void ScheduleSave();
 
   // Notification the bookmark bar model is going to be deleted. If there is
   // a pending save, it is saved immediately.
   void BookmarkModelDeleted();
 
   // Callback from backend after loading the bookmark file.
   void OnLoadFinished();
@@ skipping 19 matching lines @@
   // See class description of BookmarkLoadDetails for details on this.
   scoped_ptr<BookmarkLoadDetails> details_;
 
   // Sequenced task runner where file I/O operations will be performed at.
   scoped_refptr<base::SequencedTaskRunner> sequenced_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkStorage);
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_STORAGE_H_