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

chrome/browser/bookmarks/bookmark_html_writer.cc

Index: chrome/browser/bookmarks/bookmark_html_writer.cc
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index 73103c0e8a52ae4c2e7d6ed102f68222d87824f3..c933680cf46eecd78d2118e6e1e5cb9fac006753 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -114,16 +114,16 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
     DictionaryValue* roots_d_value = static_cast<DictionaryValue*>(roots);
     Value* root_folder_value;
     Value* other_folder_value;
-    Value* synced_folder_value;
+    Value* mobile_folder_value;
     if (!roots_d_value->Get(BookmarkCodec::kRootFolderNameKey,
                             &root_folder_value) ||
         root_folder_value->GetType() != Value::TYPE_DICTIONARY ||
         !roots_d_value->Get(BookmarkCodec::kOtherBookmarkFolderNameKey,
                             &other_folder_value) ||
         other_folder_value->GetType() != Value::TYPE_DICTIONARY ||
-        !roots_d_value->Get(BookmarkCodec::kSyncedBookmarkFolderNameKey,
-                            &synced_folder_value) ||
-        synced_folder_value->GetType() != Value::TYPE_DICTIONARY) {
+        !roots_d_value->Get(BookmarkCodec::kMobileBookmarkFolderNameKey,
+                            &mobile_folder_value) ||
+        mobile_folder_value->GetType() != Value::TYPE_DICTIONARY) {
       NOTREACHED();
       return;  // Invalid type for root folder and/or other folder.
     }
@@ -134,8 +134,8 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
                    BookmarkNode::BOOKMARK_BAR) ||
         !WriteNode(*static_cast<DictionaryValue*>(other_folder_value),
                    BookmarkNode::OTHER_NODE) ||
-        !WriteNode(*static_cast<DictionaryValue*>(synced_folder_value),
-                   BookmarkNode::SYNCED)) {
+        !WriteNode(*static_cast<DictionaryValue*>(mobile_folder_value),
+                   BookmarkNode::MOBILE)) {
       return;
     }
 
@@ -296,8 +296,8 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
       return false;
     }
     if (folder_type != BookmarkNode::OTHER_NODE &&
-        folder_type != BookmarkNode::SYNCED) {
-      // The other/synced folder name are not written out. This gives the effect
+        folder_type != BookmarkNode::MOBILE) {
+      // The other/mobile folder name are not written out. This gives the effect
       // of making the contents of the 'other folder' be a sibling to the
       // bookmark bar folder.
       if (!WriteIndent() ||
@@ -340,7 +340,7 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
       }
     }
     if (folder_type != BookmarkNode::OTHER_NODE &&
-        folder_type != BookmarkNode::SYNCED) {
+        folder_type != BookmarkNode::MOBILE) {
       // Close out the folder.
       DecrementIndent();
       if (!WriteIndent() ||
@@ -396,7 +396,7 @@ BookmarkFaviconFetcher::~BookmarkFaviconFetcher() {
 void BookmarkFaviconFetcher::ExportBookmarks() {
   ExtractUrls(profile_->GetBookmarkModel()->bookmark_bar_node());
   ExtractUrls(profile_->GetBookmarkModel()->other_node());
-  ExtractUrls(profile_->GetBookmarkModel()->synced_node());
+  ExtractUrls(profile_->GetBookmarkModel()->mobile_node());
   if (!bookmark_urls_.empty())
     FetchNextFavicon();
   else