Renames BoomarkBarModel to BookmarkModel.

chrome/browser/history/starred_url_database.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/history/starred_url_database.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/json_writer.h"
-#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/bookmarks/bookmark_codec.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/query_parser.h"
 #include "chrome/browser/meta_table_helper.h"
 #include "chrome/common/scoped_vector.h"
 #include "chrome/common/sqlite_compiled_statement.h"
 #include "chrome/common/sqlite_utils.h"
 #include "chrome/common/stl_util-inl.h"
 
 // The following table is used to store star (aka bookmark) information. This
 // class derives from URLDatabase, which has its own schema.
@@ skipping 512 matching lines @@
 }
 
 bool StarredURLDatabase::MigrateBookmarksToFileImpl(const std::wstring& path) {
   std::vector<history::StarredEntry> entries;
   if (!GetAllStarredEntries(&entries))
     return false;
 
   // Create the bookmark bar and other folder nodes.
   history::StarredEntry entry;
   entry.type = history::StarredEntry::BOOKMARK_BAR;
-  BookmarkBarNode bookmark_bar_node(NULL, GURL());
+  BookmarkNode bookmark_bar_node(NULL, GURL());
   bookmark_bar_node.Reset(entry);
   entry.type = history::StarredEntry::OTHER;
-  BookmarkBarNode other_node(NULL, GURL());
+  BookmarkNode other_node(NULL, GURL());
   other_node.Reset(entry);
 
   std::map<history::UIStarID, history::StarID> group_id_to_id_map;
-  typedef std::map<history::StarID, BookmarkBarNode*> IDToNodeMap;
+  typedef std::map<history::StarID, BookmarkNode*> IDToNodeMap;
   IDToNodeMap id_to_node_map;
 
   history::UIStarID other_folder_group_id = 0;
   history::StarID other_folder_id = 0;
 
   // Iterate through the entries building a mapping between group_id and id.
   for (std::vector<history::StarredEntry>::const_iterator i = entries.begin();
        i != entries.end(); ++i) {
     if (i->type != history::StarredEntry::URL) {
       group_id_to_id_map[i->group_id] = i->id;
@@ skipping 17 matching lines @@
   for (std::vector<history::StarredEntry>::iterator i = entries.begin();
        i != entries.end(); ++i) {
     if (!i->parent_group_id) {
       DCHECK(i->type == history::StarredEntry::BOOKMARK_BAR ||
              i->type == history::StarredEntry::OTHER);
       // Only entries with no parent should be the bookmark bar and other
       // bookmarks folders.
       continue;
     }
 
-    BookmarkBarNode* node = id_to_node_map[i->id];
+    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 group to have been created before
       // encountering the details.
 
       // The created nodes are owned by the root node.
-      node = new BookmarkBarNode(NULL, i->url);
+      node = new BookmarkNode(NULL, i->url);
       id_to_node_map[i->id] = node;
     }
     node->Reset(*i);
 
     DCHECK(group_id_to_id_map.find(i->parent_group_id) !=
            group_id_to_id_map.end());
     history::StarID parent_id = group_id_to_id_map[i->parent_group_id];
-    BookmarkBarNode* parent = id_to_node_map[parent_id];
+    BookmarkNode* parent = id_to_node_map[parent_id];
     if (!parent) {
       // Haven't encountered the parent yet, create it now.
-      parent = new BookmarkBarNode(NULL, GURL());
+      parent = new BookmarkNode(NULL, GURL());
       id_to_node_map[parent_id] = parent;
     }
 
     // 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(parent->GetChildCount(), node);
   }
 
   // Save to file.
   BookmarkCodec encoder;
   scoped_ptr<Value> encoded_bookmarks(
       encoder.Encode(&bookmark_bar_node, &other_node));
   std::string content;
   JSONWriter::Write(encoded_bookmarks.get(), true, &content);
 
   return (file_util::WriteFile(path, content.c_str(),
                                static_cast<int>(content.length())) != -1);
 }
 
 }  // namespace history