Lands http://codereview.chromium.org/155128 for Thiago....

chrome/browser/bookmarks/bookmark_html_writer.cc

Index: chrome/browser/bookmarks/bookmark_html_writer.cc
===================================================================
--- chrome/browser/bookmarks/bookmark_html_writer.cc	(revision 20068)
+++ chrome/browser/bookmarks/bookmark_html_writer.cc	(working copy)
@@ -109,9 +109,9 @@
     IncrementIndent();
 
     if (!WriteNode(*static_cast<DictionaryValue*>(root_folder_value),
-                   history::StarredEntry::BOOKMARK_BAR) ||
+                   BookmarkNode::BOOKMARK_BAR) ||
         !WriteNode(*static_cast<DictionaryValue*>(other_folder_value),
-                   history::StarredEntry::OTHER)) {
+                   BookmarkNode::OTHER_NODE)) {
       return;
     }
 
@@ -204,7 +204,7 @@
 
   // Writes the node and all its children, returning true on success.
   bool WriteNode(const DictionaryValue& value,
-                 history::StarredEntry::Type folder_type) {
+                BookmarkNode::Type folder_type) {
     std::wstring title, date_added_string, type_string;
     if (!value.GetString(BookmarkCodec::kNameKey, &title) ||
         !value.GetString(BookmarkCodec::kDateAddedKey, &date_added_string) ||
@@ -245,7 +245,7 @@
       NOTREACHED();
       return false;
     }
-    if (folder_type != history::StarredEntry::OTHER) {
+    if (folder_type != BookmarkNode::OTHER_NODE) {
       // The other folder name is not written out. This gives the effect of
       // making the contents of the 'other folder' be a sibling to the bookmark
       // bar folder.
@@ -256,7 +256,7 @@
           !WriteTime(last_modified_date)) {
         return false;
       }
-      if (folder_type == history::StarredEntry::BOOKMARK_BAR) {
+      if (folder_type == BookmarkNode::BOOKMARK_BAR) {
         if (!Write(kBookmarkBar))
           return false;
         title = l10n_util::GetString(IDS_BOOMARK_BAR_FOLDER_NAME);
@@ -284,11 +284,11 @@
         return false;
       }
       if (!WriteNode(*static_cast<DictionaryValue*>(child_value),
-                     history::StarredEntry::USER_GROUP)) {
+                     BookmarkNode::FOLDER)) {
         return false;
       }
     }
-    if (folder_type != history::StarredEntry::OTHER) {
+    if (folder_type != BookmarkNode::OTHER_NODE) {
       // Close out the folder.
       DecrementIndent();
       if (!WriteIndent() ||