Implement ID persistence for bookmarks:

- Bookmark codec now takes in a ctor argument persist_ids
- If it's true, it will serialize IDs of bookmarks when encoding, and
  deserialize already serialized IDs (if present) when decoding.
- During decoding, unique-ify the IDs if they are not unique.
- Add unit tests for all new code.


Coming up in a separate changelist:
- Move ID generation logic to bookmark model, and make it non-static.

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

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

1 files changed, 22 insertions, 8 deletions

diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 6540efe..3bf43dd 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -27,6 +27,11 @@ int next_id_ = 1;
 
 }
 
+// static
+void BookmarkNode::SetNextId(int next_id) {
+  next_id_ = next_id;
+}
+
 const SkBitmap& BookmarkNode::GetFavIcon() {
   if (!loaded_favicon_) {
     loaded_favicon_ = true;
@@ -36,14 +41,23 @@ const SkBitmap& BookmarkNode::GetFavIcon() {
 }
 
 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) {