Implement ID persistence for bookmarks:...

chrome/browser/bookmarks/bookmark_model.cc

Index: chrome/browser/bookmarks/bookmark_model.cc
===================================================================
--- chrome/browser/bookmarks/bookmark_model.cc	(revision 14989)
+++ chrome/browser/bookmarks/bookmark_model.cc	(working copy)
@@ -27,6 +27,11 @@
 
 }
 
+// static
+void BookmarkNode::SetNextId(int next_id) {
+  next_id_ = next_id;
+}
+
 const SkBitmap& BookmarkNode::GetFavIcon() {
   if (!loaded_favicon_) {
     loaded_favicon_ = true;
@@ -36,16 +41,25 @@
 }
 
 BookmarkNode::BookmarkNode(BookmarkModel* model, const GURL& url)
-    : model_(model),
-      id_(next_id_++),
-      loaded_favicon_(false),
-      favicon_load_handle_(0),
-      url_(url),
-      type_(!url.is_empty() ? history::StarredEntry::URL :
-            history::StarredEntry::BOOKMARK_BAR),
-      date_added_(Time::Now()) {
+    : url_(url) {
+  Initialize(model, 0);
 }
 
+BookmarkNode::BookmarkNode(BookmarkModel* model, int id, const GURL& url)
+    : url_(url){
+  Initialize(model, id);
+}
+
+void BookmarkNode::Initialize(BookmarkModel* model, int id) {
+  model_ = model;
+  id_ = id == 0 ? next_id_++ : id;
+  loaded_favicon_ = false;
+  favicon_load_handle_ = 0;
+  type_ = !url_.is_empty() ? history::StarredEntry::URL :
+          history::StarredEntry::BOOKMARK_BAR;
+  date_added_ = Time::Now();
+}
+
 void BookmarkNode::Reset(const history::StarredEntry& entry) {
   DCHECK(entry.type != history::StarredEntry::URL ||
          entry.url == url_);