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

chrome/browser/bookmarks/bookmark_codec.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/bookmarks/bookmark_codec.h"
 
 #include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 120 matching lines @@
   DictionaryValue* value = new DictionaryValue();
   std::string id;
   if (persist_ids_) {
     id = IntToString(node->id());
     value->SetString(kIdKey, id);
   }
   const std::wstring& title = node->GetTitle();
   value->SetString(kNameKey, title);
   value->SetString(kDateAddedKey,
                    Int64ToWString(node->date_added().ToInternalValue()));
-  if (node->GetType() == history::StarredEntry::URL) {
+  if (node->GetType() == BookmarkNode::URL) {
     value->SetString(kTypeKey, kTypeURL);
     std::wstring url = UTF8ToWide(node->GetURL().possibly_invalid_spec());
     value->SetString(kURLKey, url);
     UpdateChecksumWithUrlNode(id, title, url);
   } else {
     value->SetString(kTypeKey, kTypeFolder);
     value->SetString(kDateModifiedKey,
                      Int64ToWString(node->date_group_modified().
                                     ToInternalValue()));
     UpdateChecksumWithFolderNode(id, title);
@@ skipping 44 matching lines @@
       other_folder_value->GetType() != Value::TYPE_DICTIONARY)
     return false;  // Invalid type for root folder and/or other folder.
 
   DecodeNode(*static_cast<DictionaryValue*>(root_folder_value), NULL,
              bb_node);
   DecodeNode(*static_cast<DictionaryValue*>(other_folder_value), NULL,
              other_folder_node);
   // Need to reset the type as decoding resets the type to FOLDER. Similarly
   // we need to reset the title as the title is persisted and restored from
   // the file.
-  bb_node->SetType(history::StarredEntry::BOOKMARK_BAR);
-  other_folder_node->SetType(history::StarredEntry::OTHER);
+  bb_node->SetType(BookmarkNode::BOOKMARK_BAR);
+  other_folder_node->SetType(BookmarkNode::OTHER_NODE);
   bb_node->SetTitle(l10n_util::GetString(IDS_BOOMARK_BAR_FOLDER_NAME));
   other_folder_node->SetTitle(
       l10n_util::GetString(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME));
 
   return true;
 }
 
 bool BookmarkCodec::DecodeChildren(const ListValue& child_value_list,
                                    BookmarkNode* parent) {
   for (size_t i = 0; i < child_value_list.GetSize(); ++i) {
@@ skipping 41 matching lines @@
     if (!value.GetString(kURLKey, &url_string))
       return false;
 
     if (!node)
       node = new BookmarkNode(id, GURL(WideToUTF8(url_string)));
     else
       return false; // Node invalid.
 
     if (parent)
       parent->Add(parent->GetChildCount(), node);
-    node->SetType(history::StarredEntry::URL);
+    node->SetType(BookmarkNode::URL);
     UpdateChecksumWithUrlNode(id_string, title, url_string);
   } else {
     std::wstring last_modified_date;
     if (!value.GetString(kDateModifiedKey, &last_modified_date))
       last_modified_date = Int64ToWString(Time::Now().ToInternalValue());
 
     Value* child_values;
     if (!value.Get(kChildrenKey, &child_values))
       return false;
 
     if (child_values->GetType() != Value::TYPE_LIST)
       return false;
 
     if (!node) {
       node = new BookmarkNode(id, GURL());
     } else {
       // If a new node is not created, explicitly assign ID to the existing one.
       DCHECK(id != 0);
       node->set_id(id);
     }
 
-    node->SetType(history::StarredEntry::USER_GROUP);
+    node->SetType(BookmarkNode::FOLDER);
     node->set_date_group_modified(Time::FromInternalValue(
         StringToInt64(WideToUTF16Hack(last_modified_date))));
 
     if (parent)
       parent->Add(parent->GetChildCount(), node);
 
     UpdateChecksumWithFolderNode(id_string, title);
+
     if (!DecodeChildren(*static_cast<ListValue*>(child_values), node))
       return false;
   }
 
   node->SetTitle(title);
   node->set_date_added(Time::FromInternalValue(
       StringToInt64(WideToUTF16Hack(date_added_string))));
   return true;
 }
 
@@ skipping 23 matching lines @@
 
 void BookmarkCodec::InitializeChecksum() {
   MD5Init(&md5_context_);
 }
 
 void BookmarkCodec::FinalizeChecksum() {
   MD5Digest digest;
   MD5Final(&digest, &md5_context_);
   computed_checksum_ = MD5DigestToBase16(digest);
 }