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

chrome/browser/history/starred_url_database.cc

 // Copyright (c) 2011 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/history/starred_url_database.h"
 
 #include "base/file_util.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 86 matching lines @@
       break;
     case history::StarredEntry::USER_FOLDER:
       node->set_type(BookmarkNode::FOLDER);
       break;
     case history::StarredEntry::BOOKMARK_BAR:
       node->set_type(BookmarkNode::BOOKMARK_BAR);
       break;
     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();
       break;
   }
 }
 
 }  // namespace
 
 // static
@@ skipping 461 matching lines @@
     return false;
 
   // Create the bookmark bar and other folder nodes.
   history::StarredEntry entry;
   entry.type = history::StarredEntry::BOOKMARK_BAR;
   BookmarkNode bookmark_bar_node(0, GURL());
   ResetBookmarkNode(entry, &bookmark_bar_node);
   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;
   IDToNodeMap id_to_node_map;
 
   history::UIStarID other_folder_folder_id = 0;
   history::StarID other_folder_id = 0;
 
   // Iterate through the entries building a mapping between folder_id and id.
   for (std::vector<history::StarredEntry>::const_iterator i = entries.begin();
@@ skipping 13 matching lines @@
   if (other_folder_folder_id) {
     id_to_node_map[other_folder_id] = &other_node;
     folder_id_to_id_map[other_folder_folder_id] = other_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::MOBILE ||
              i->type == history::StarredEntry::OTHER);
       // Only entries with no parent should be the bookmark bar and other
       // bookmarks folders.
       continue;
     }
 
     BookmarkNode* node = id_to_node_map[i->id];
     if (!node) {
       // Creating a node results in creating the parent. As such, it is
       // possible for the node representing a folder to have been created before
@@ skipping 17 matching lines @@
 
     // Add the node to its parent. |entries| is ordered by parent then
     // visual order so that we know we maintain visual order by always adding
     // to the end.
     parent->Add(node, parent->child_count());
   }
 
   // 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);
 
   return (file_util::WriteFile(path, content.c_str(),
                                static_cast<int>(content.length())) != -1);
 }
 
 }  // namespace history