Extract GetNodeByID() method from BookmarkModel.

chrome/browser/extensions/api/bookmarks/bookmarks_api.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/bookmarks_api.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 113 matching lines @@
   error_ = keys::kInvalidIdError;
   return false;
 }
 
 const BookmarkNode* BookmarksFunction::GetBookmarkNodeFromId(
     const std::string& id_string) {
   int64 id;
   if (!GetBookmarkIdAsInt64(id_string, &id))
     return NULL;
 
-  BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile());
-  const BookmarkNode* node = model->GetNodeByID(id);
+  const BookmarkNode* node = GetBookmarkNodeByID(
+      BookmarkModelFactory::GetForProfile(GetProfile()), id);
   if (!node)
     error_ = keys::kNoNodeError;
 
   return node;
 }
 
 bool BookmarksFunction::EditBookmarksEnabled() {
   PrefService* prefs = user_prefs::UserPrefs::Get(GetProfile());
   if (prefs->GetBoolean(prefs::kEditBookmarksEnabled))
     return true;
@@ skipping 370 matching lines @@
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile());
   int64 parentId;
 
   if (!params->bookmark.parent_id.get()) {
     // Optional, default to "other bookmarks".
     parentId = model->other_node()->id();
   } else {
     if (!GetBookmarkIdAsInt64(*params->bookmark.parent_id, &parentId))
       return false;
   }
-  const BookmarkNode* parent = model->GetNodeByID(parentId);
+  const BookmarkNode* parent = GetBookmarkNodeByID(model, parentId);
   if (!parent) {
     error_ = keys::kNoParentError;
     return false;
   }
   if (parent->is_root()) {  // Can't create children of the root.
     error_ = keys::kModifySpecialError;
     return false;
   }
 
   int index;
@@ skipping 67 matching lines @@
 
   const BookmarkNode* parent = NULL;
   if (!params->destination.parent_id.get()) {
     // Optional, defaults to current parent.
     parent = node->parent();
   } else {
     int64 parentId;
     if (!GetBookmarkIdAsInt64(*params->destination.parent_id, &parentId))
       return false;
 
-    parent = model->GetNodeByID(parentId);
+    parent = GetBookmarkNodeByID(model, parentId);
   }
   if (!parent) {
     error_ = keys::kNoParentError;
     // TODO(erikkay) return an error message.
     return false;
   }
   if (parent == model->root_node()) {
     error_ = keys::kModifySpecialError;
     return false;
   }
@@ skipping 107 matching lines @@
     std::string parent_id;
     if (json->HasKey(keys::kParentIdKey)) {
       if (!json->GetString(keys::kParentIdKey, &parent_id))
         return;
     }
     BookmarkModel* model = BookmarkModelFactory::GetForProfile(
         Profile::FromBrowserContext(browser_context_));
 
     int64 parent_id_int64;
     base::StringToInt64(parent_id, &parent_id_int64);
-    const BookmarkNode* parent = model->GetNodeByID(parent_id_int64);
+    const BookmarkNode* parent = GetBookmarkNodeByID(model, parent_id_int64);
     if (!parent)
       return;
 
     std::string bucket_id = base::UTF16ToUTF8(parent->GetTitle());
     std::string title;
     json->GetString(keys::kTitleKey, &title);
     std::string url_string;
     json->GetString(keys::kUrlKey, &url_string);
 
     bucket_id += title;
@@ skipping 17 matching lines @@
     IdList ids;
     bool invalid_id = false;
     if (!BookmarksRemoveFunction::ExtractIds(args, &ids, &invalid_id) ||
         invalid_id) {
       return;
     }
 
     for (IdList::iterator it = ids.begin(); it != ids.end(); ++it) {
       BookmarkModel* model = BookmarkModelFactory::GetForProfile(
           Profile::FromBrowserContext(browser_context_));
-      const BookmarkNode* node = model->GetNodeByID(*it);
+      const BookmarkNode* node = GetBookmarkNodeByID(model, *it);
       if (!node || node->is_root())
         return;
 
       std::string bucket_id;
       bucket_id += base::UTF16ToUTF8(node->parent()->GetTitle());
       bucket_id += base::UTF16ToUTF8(node->GetTitle());
       bucket_id += node->url().spec();
       buckets->push_back(GetBucket(base::SHA1HashString(bucket_id)));
     }
   }
@@ skipping 217 matching lines @@
 #if !defined(OS_ANDROID)
   // Android does not have support for the standard exporter.
   // TODO(jgreenwald): remove ifdef once extensions are no longer built on
   // Android.
   bookmark_html_writer::WriteBookmarks(GetProfile(), path, NULL);
 #endif
   Release();  // Balanced in BookmarksIOFunction::SelectFile()
 }
 
 }  // namespace extensions