Extract GetNodeByID() method from BookmarkModel.

chrome/browser/bookmarks/bookmark_utils.cc

 // Copyright (c) 2012 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_utils.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
@@ skipping 93 matching lines @@
   if (!node || model->is_permanent_node(node))
     return false;
 
   for (size_t i = 0; i < selected_nodes.size(); ++i)
     if (node->id() == selected_nodes[i]->id())
       return true;
 
   return HasSelectedAncestor(model, selected_nodes, node->parent());
 }
 
+const BookmarkNode* GetNodeByID(const BookmarkNode* node, int64 id) {
+  if (node->id() == id)
+    return node;
+
+  for (int i = 0, child_count = node->child_count(); i < child_count; ++i) {
+    const BookmarkNode* result = GetNodeByID(node->GetChild(i), id);
+    if (result)
+      return result;
+  }
+  return NULL;
+}
+
 }  // namespace
 
 namespace bookmark_utils {
 
 QueryFields::QueryFields() {}
 QueryFields::~QueryFields() {}
 
 void CloneBookmarkNode(BookmarkModel* model,
                        const std::vector<BookmarkNodeData::Element>& elements,
                        const BookmarkNode* parent,
@@ skipping 209 matching lines @@
   return real_parent;
 }
 
 void DeleteBookmarkFolders(BookmarkModel* model,
                            const std::vector<int64>& ids) {
   // Remove the folders that were removed. This has to be done after all the
   // other changes have been committed.
   for (std::vector<int64>::const_iterator iter = ids.begin();
        iter != ids.end();
        ++iter) {
-    const BookmarkNode* node = model->GetNodeByID(*iter);
+    const BookmarkNode* node = GetBookmarkNodeByID(model, *iter);
     if (!node)
       continue;
     const BookmarkNode* parent = node->parent();
     model->Remove(parent, parent->GetIndexOf(node));
   }
 }
 
 void AddIfNotBookmarked(BookmarkModel* model,
                         const GURL& url,
                         const base::string16& title) {
@@ skipping 14 matching lines @@
   // Remove all the bookmarks.
   for (size_t i = 0; i < bookmarks.size(); ++i) {
     const BookmarkNode* node = bookmarks[i];
     int index = node->parent()->GetIndexOf(node);
     if (index > -1)
       model->Remove(node->parent(), index);
   }
 }
 
 }  // namespace bookmark_utils
+
+const BookmarkNode* GetBookmarkNodeByID(const BookmarkModel* model, int64 id) {
+  // TODO(sky): TreeNode needs a method that visits all nodes using a predicate.
+  return GetNodeByID(const_cast<BookmarkModel*>(model)->root_node(), id);

[sky, 2014/04/21 15:26:08]

Ick. Can you make all the getters of nodes in BookmarkModel const?

[sky, 2014/04/21 15:32:21]

If doing that results in a ton of other changes don't bother for this patch.
Keep it at a non-const BookmarkModel and we can revisit later.

[tfarina, 2014/04/21 20:42:06]

Done.

+}