Revert "Revert 84829 - Initial implementation of "Synced Bookmarks" folder."

chrome/browser/history/starred_url_database.cc

Index: chrome/browser/history/starred_url_database.cc
diff --git a/chrome/browser/history/starred_url_database.cc b/chrome/browser/history/starred_url_database.cc
index 5336e07180f628468d3047c02493c3aa170a98fd..abea9980dc2dcc83c43ad05cdf4ab60939680785 100644
--- a/chrome/browser/history/starred_url_database.cc
+++ b/chrome/browser/history/starred_url_database.cc
@@ -24,7 +24,7 @@
 //   id                 Unique identifier (primary key) for the entry.
 //   type               Type of entry, if 0 this corresponds to a URL, 1 for
 //                      a system folder, 2 for a user created folder, 3 for
-//                      other.
+//                      other, 4 for synced.

[sky, 2011/05/12 16:29:13]

At one point bookmarks were saved in the db (this file), and not in the json
file. Anyone that stills has their bookmarks in the db is NOT going to have the
synced folder. Hopefully the only you should have to change in this file is the
call to encoder.Encode.

[Yaron, 2011/05/12 18:19:23]

So we never actually write to this DB anymore, you're saying I should revert
everything except encode, including updating the enum? Well actually, I need to
update the enum for encode to make sense. Comment included below..

 //   url_id             ID of the url, only valid if type == 0
 //   group_id           ID of the folder, only valid if type != 0. This id comes
 //                      from the UI and is NOT the same as id.
@@ -66,6 +66,9 @@ void FillInStarredEntry(const sql::Statement& s, StarredEntry* entry) {
     case 3:
       entry->type = history::StarredEntry::OTHER;
       break;
+    case 4:
+      entry->type = history::StarredEntry::SYNCED;
+      break;
     default:
       NOTREACHED();
       break;
@@ -213,6 +216,9 @@ StarID StarredURLDatabase::CreateStarredEntryRow(URLID url_id,
     case history::StarredEntry::OTHER:
       statement.BindInt(0, 3);
       break;
+    case history::StarredEntry::SYNCED:
+      statement.BindInt(0, 4);
+      break;
     default:
       NOTREACHED();
   }
@@ -457,6 +463,28 @@ bool StarredURLDatabase::EnsureStarredIntegrityImpl(
     roots->insert(other_node);
   }
 

[Yaron, 2011/05/12 18:19:23]

Looks like I should just revert this part?

+  // Make sure the synced node exists.
+  StarredNode* synced_node = GetNodeByType(*roots, StarredEntry::SYNCED);
+  if (!synced_node) {
+    LOG(WARNING) << "No bookmark synced folder in database";
+    StarredEntry entry;
+    entry.folder_id = GetMaxFolderID() + 1;
+    if (entry.folder_id == 2) {
+      NOTREACHED() << "Unable to get new id for synced bookmarks folder";
+      return false;
+    }
+    entry.id = CreateStarredEntryRow(
+        0, entry.folder_id, 0, UTF8ToUTF16("synced"), base::Time::Now(), 0,
+        history::StarredEntry::SYNCED);
+    if (!entry.id) {
+      NOTREACHED() << "Unable to create synced bookmarks folder";
+      return false;
+    }
+    entry.type = StarredEntry::SYNCED;
+    StarredNode* synced_node = new StarredNode(entry);
+    roots->insert(synced_node);
+  }
+
   // We could potentially make sure only one folder with type
   // BOOKMARK_BAR/OTHER, but history backend enforces this.
 
@@ -545,11 +573,17 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) {
   entry.type = history::StarredEntry::OTHER;
   BookmarkNode other_node(0, GURL());
   other_node.Reset(entry);
+  entry.type = history::StarredEntry::SYNCED;
+  BookmarkNode synced_node(0, GURL());
+  synced_node.Reset(entry);
 
   std::map<history::UIStarID, history::StarID> folder_id_to_id_map;
   typedef std::map<history::StarID, BookmarkNode*> IDToNodeMap;
   IDToNodeMap id_to_node_map;
 
+  history::UIStarID synced_folder_folder_id = 0;
+  history::StarID synced_folder_id = 0;
+
   history::UIStarID other_folder_folder_id = 0;
   history::StarID other_folder_id = 0;
 
@@ -562,6 +596,10 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) {
         other_folder_id = i->id;
         other_folder_folder_id = i->folder_id;
       }
+      if (i->type == history::StarredEntry::SYNCED) {
+        synced_folder_id = i->id;
+        synced_folder_folder_id = i->folder_id;
+      }
     }
   }
 
@@ -573,12 +611,17 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) {
     id_to_node_map[other_folder_id] = &other_node;
     folder_id_to_id_map[other_folder_folder_id] = other_folder_id;
   }
+  if (synced_folder_folder_id) {
+    id_to_node_map[synced_folder_id] = &synced_node;
+    folder_id_to_id_map[synced_folder_folder_id] = synced_folder_id;
+  }
 
   // Iterate through the entries again creating the nodes.
   for (std::vector<history::StarredEntry>::iterator i = entries.begin();
        i != entries.end(); ++i) {
     if (!i->parent_folder_id) {
       DCHECK(i->type == history::StarredEntry::BOOKMARK_BAR ||
+             i->type == history::StarredEntry::SYNCED ||
              i->type == history::StarredEntry::OTHER);
       // Only entries with no parent should be the bookmark bar and other
       // bookmarks folders.
@@ -616,7 +659,7 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) {
   // Save to file.
   BookmarkCodec encoder;
   scoped_ptr<Value> encoded_bookmarks(
-      encoder.Encode(&bookmark_bar_node, &other_node));
+      encoder.Encode(&bookmark_bar_node, &other_node, &synced_node));
   std::string content;
   base::JSONWriter::Write(encoded_bookmarks.get(), true, &content);