1 files changed, 45 insertions, 18 deletions

diff --git a/chrome/browser/bookmark_storage.h b/chrome/browser/bookmark_storage.h
index 8ba00d0..5792c00 100644
--- a/chrome/browser/bookmark_storage.h
+++ b/chrome/browser/bookmark_storage.h
@@ -27,17 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// BookmarkService handles reading/write the bookmark bar model. The
-// BookmarkBarModel uses the BookmarkService to load bookmarks from
-// disk, as well as notifying the BookmarkService every time the model
-// changes.
-//
-// Internally BookmarkService uses BookmarkCoded to do the actual read/write.
-
-// NOTE: This class is currently unsed. The plan is to move bookmarks
-// out of the history db using this class and BookmarksCodec instead
-// (bug 1256202).
-
 #ifndef CHROME_BROWSER_BOOKMARK_STORAGE_H_
 #define CHROME_BROWSER_BOOKMARK_STORAGE_H_
 
@@ -49,9 +38,12 @@ class BookmarkBarModel;
 class Profile;
 class Value;
 
-namespace {
-class BookmarkStorageBackend;
-}
+// BookmarkStorage handles reading/write the bookmark bar model. The
+// BookmarkBarModel 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::RefCountedThreadSafe<BookmarkStorage> {
   friend class BookmarkStorageBackend;
@@ -60,8 +52,10 @@ class BookmarkStorage : public base::RefCountedThreadSafe<BookmarkStorage> {
   // Creates a BookmarkStorage for the specified model
   BookmarkStorage(Profile* profile, BookmarkBarModel* model);
 
-  // Loads the bookmarks into the model, notifying the model when done.
-  void LoadBookmarks();
+  // Loads the bookmarks into the model, notifying the model when done. If
+  // load_from_history is true, the bookmarks are loaded from the file written
+  // by history (StarredURLDatabase).
+  void LoadBookmarks(bool load_from_history);
 
   // Schedules saving the bookmark bar model to disk.
   void ScheduleSave();
@@ -72,13 +66,15 @@ class BookmarkStorage : public base::RefCountedThreadSafe<BookmarkStorage> {
 
  private:
   // Callback from backend with the results of the bookmark file.
-  void LoadedBookmarks(Value* root_value);
+  void LoadedBookmarks(Value* root_value,
+                       bool bookmark_file_exists,
+                       bool loaded_from_history);
 
   // Schedules a save on the backend thread.
   void SaveNow();
 
   // Returns the thread the backend is run on.
-  Thread* backend_thread() { return g_browser_process->file_thread(); }
+  Thread* backend_thread() const { return backend_thread_; }
 
   // The model. The model is NULL once BookmarkModelDeleted has been invoked.
   BookmarkBarModel* model_;
@@ -89,7 +85,38 @@ class BookmarkStorage : public base::RefCountedThreadSafe<BookmarkStorage> {
   // The backend handles actual reading/writing to disk.
   scoped_refptr<BookmarkStorageBackend> backend_;
 
+  // Thread read/writing is run on. This comes from the profile, and is null
+  // during testing.
+  Thread* backend_thread_;
+
   DISALLOW_COPY_AND_ASSIGN(BookmarkStorage);
 };
 
+// Used to save the bookmarks on the file thread.
+class BookmarkStorageBackend :
+    public base::RefCountedThreadSafe<BookmarkStorageBackend> {
+ public:
+  explicit BookmarkStorageBackend(const std::wstring& path,
+                                  const std::wstring& tmp_histor_path);
+
+  // Writes the specified value to disk. This takes ownership of |value| and
+  // deletes it when done.
+  void Write(Value* value);
+
+  // Reads the bookmarks from kBookmarksFileName. Notifies |service| with
+  // the results on the specified MessageLoop.
+  void Read(scoped_refptr<BookmarkStorage> service,
+            MessageLoop* message_loop,
+            bool load_from_history);
+
+ private:
+  // Path we read/write to.
+  const std::wstring path_;
+
+  // Path bookmarks are read from if asked to load from history file.
+  const std::wstring tmp_history_path_;
+
+  DISALLOW_EVIL_CONSTRUCTORS(BookmarkStorageBackend);
+};
+
 #endif  // CHROME_BROWSER_BOOKMARK_STORAGE_H_