Extract GetNodeByID() method from BookmarkModel.

chrome/browser/bookmarks/bookmark_node_data.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_node_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/pickle.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 
 const char* BookmarkNodeData::kClipboardFormatString =
     "chromium/x-bookmark-entries";
 
 BookmarkNodeData::Element::Element() : is_url(false), id_(0) {
 }
 
 BookmarkNodeData::Element::Element(const BookmarkNode* node)
     : is_url(node->is_url()),
@@ skipping 219 matching lines @@
 
 std::vector<const BookmarkNode*> BookmarkNodeData::GetNodes(
     BookmarkModel* model,
     const base::FilePath& profile_path) const {
   std::vector<const BookmarkNode*> nodes;
 
   if (!IsFromProfilePath(profile_path))
     return nodes;
 
   for (size_t i = 0; i < elements.size(); ++i) {
-    const BookmarkNode* node = model->GetNodeByID(elements[i].id_);
+    const BookmarkNode* node = GetBookmarkNodeByID(model, elements[i].id_);
     if (!node) {
       nodes.clear();
       return nodes;
     }
     nodes.push_back(node);
   }
   return nodes;
 }
 
 const BookmarkNode* BookmarkNodeData::GetFirstNode(
@@ skipping 12 matching lines @@
     const base::FilePath& profile_path) {
   DCHECK(profile_path_.empty());
   profile_path_ = profile_path;
 }
 
 bool BookmarkNodeData::IsFromProfilePath(
     const base::FilePath& profile_path) const {
   // An empty path means the data is not associated with any profile.
   return !profile_path_.empty() && profile_path_ == profile_path;
 }