Try the original CL "Always persist bookmark IDs" again with the fix to

Valgrind issue. The fix is in bookmark_storage.h - initialized the newly
added member ids_reassigned_ of LoadDetails class.

See http://codereview.chromium.org/149310 for the original CL.

TEST=NONE
BUG=16068

Review URL: http://codereview.chromium.org/155456

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20565 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 5 deletions

diff --git a/chrome/browser/bookmarks/bookmark_storage.h b/chrome/browser/bookmarks/bookmark_storage.h
index cc18b60..3b83468 100644
--- a/chrome/browser/bookmarks/bookmark_storage.h
+++ b/chrome/browser/bookmarks/bookmark_storage.h
@@ -44,11 +44,12 @@ class BookmarkStorage : public NotificationObserver,
     LoadDetails(BookmarkNode* bb_node,
                 BookmarkNode* other_folder_node,
                 BookmarkIndex* index,
-                int max_id)
+                int64 max_id)
         : bb_node_(bb_node),
           other_folder_node_(other_folder_node),
           index_(index),
-          max_id_(max_id) {
+          max_id_(max_id),
+          ids_reassigned_(false) {
     }
 
     void release() {
@@ -62,8 +63,8 @@ class BookmarkStorage : public NotificationObserver,
     BookmarkIndex* index() { return index_.get(); }
 
     // Max id of the nodes.
-    void set_max_id(int max_id) { max_id_ = max_id; }
-    int max_id() const { return max_id_; }
+    void set_max_id(int64 max_id) { max_id_ = max_id; }
+    int64 max_id() const { return max_id_; }
 
     // Computed checksum.
     void set_computed_checksum(const std::string& value) {
@@ -77,13 +78,18 @@ class BookmarkStorage : public NotificationObserver,
     }
     const std::string& stored_checksum() const { return stored_checksum_; }
 
+    // Whether ids were reassigned.
+    void set_ids_reassigned(bool value) { ids_reassigned_ = value; }
+    bool ids_reassigned() const { return ids_reassigned_; }
+
    private:
     scoped_ptr<BookmarkNode> bb_node_;
     scoped_ptr<BookmarkNode> other_folder_node_;
     scoped_ptr<BookmarkIndex> index_;
-    int max_id_;
+    int64 max_id_;
     std::string computed_checksum_;
     std::string stored_checksum_;
+    bool ids_reassigned_;
 
     DISALLOW_COPY_AND_ASSIGN(LoadDetails);
   };