BookmarkModel cleanup. synced_node is now mobile_node and I'm nuking

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 166e20cb6fddf5431bf6a31f7031029846399e14..8328d1678a5de64a2ac58b1b3509074a8c0b8186 100644
--- a/chrome/browser/history/starred_url_database.cc
+++ b/chrome/browser/history/starred_url_database.cc
@@ -104,8 +104,8 @@ void ResetBookmarkNode(const history::StarredEntry& entry,
     case history::StarredEntry::OTHER:
       node->set_type(BookmarkNode::OTHER_NODE);
       break;
-    case history::StarredEntry::SYNCED:
-      node->set_type(BookmarkNode::SYNCED);
+    case history::StarredEntry::MOBILE:
+      node->set_type(BookmarkNode::MOBILE);
       break;
     default:
       NOTREACHED();
@@ -587,12 +587,12 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) {
   entry.type = history::StarredEntry::OTHER;
   BookmarkNode other_node(0, GURL());
   ResetBookmarkNode(entry, &other_node);
-  // NOTE(yfriedman): We don't do anything with the synced star node because it
-  // won't ever exist in the starred node DB. We only need to create it to pass
-  // to "encode".
-  entry.type = history::StarredEntry::SYNCED;
-  BookmarkNode synced_node(0, GURL());
-  ResetBookmarkNode(entry, &synced_node);
+  // NOTE(yfriedman): We don't do anything with the mobile node because it won't
+  // ever exist in the starred node DB. We only need to create it to pass to
+  // "encode".
+  entry.type = history::StarredEntry::MOBILE;
+  BookmarkNode mobile_node(0, GURL());
+  ResetBookmarkNode(entry, &mobile_node);
 
   std::map<history::UIStarID, history::StarID> folder_id_to_id_map;
   typedef std::map<history::StarID, BookmarkNode*> IDToNodeMap;
@@ -626,7 +626,7 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) {
        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::MOBILE ||
              i->type == history::StarredEntry::OTHER);
       // Only entries with no parent should be the bookmark bar and other
       // bookmarks folders.
@@ -664,7 +664,7 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) {
   // Save to file.
   BookmarkCodec encoder;
   scoped_ptr<Value> encoded_bookmarks(
-      encoder.Encode(&bookmark_bar_node, &other_node, &synced_node));
+      encoder.Encode(&bookmark_bar_node, &other_node, &mobile_node));
   std::string content;
   base::JSONWriter::Write(encoded_bookmarks.get(), true, &content);