Extract GetNodeByID() method from BookmarkModel.

chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.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/extensions/api/bookmarks/bookmark_api_helpers.h"
 
 #include <math.h>  // For floor()
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h"
 #include "chrome/common/extensions/api/bookmarks.h"
 
 namespace extensions {
 
 namespace keys = bookmark_api_constants;
 using api::bookmarks::BookmarkTreeNode;
 
 namespace bookmark_api_helpers {
 
@@ skipping 70 matching lines @@
 void AddNodeFoldersOnly(const BookmarkNode* node,
                         std::vector<linked_ptr<BookmarkTreeNode> >* nodes,
                         bool recurse) {
   return AddNodeHelper(node, nodes, recurse, true);
 }
 
 bool RemoveNode(BookmarkModel* model,
                 int64 id,
                 bool recursive,
                 std::string* error) {
-  const BookmarkNode* node = model->GetNodeByID(id);
+  const BookmarkNode* node = GetBookmarkNodeByID(model, id);
   if (!node) {
     *error = keys::kNoNodeError;
     return false;
   }
   if (model->is_permanent_node(node)) {
     *error = keys::kModifySpecialError;
     return false;
   }
   if (node->is_folder() && !node->empty() && !recursive) {
     *error = keys::kFolderNotEmptyError;
     return false;
   }
 
   const BookmarkNode* parent = node->parent();
   model->Remove(parent, parent->GetIndexOf(node));
   return true;
 }
 
 }  // namespace bookmark_api_helpers
 }  // namespace extensions