Extract GetNodeByID() method from BookmarkModel.

chrome/browser/android/bookmarks/bookmarks_bridge.cc

 // Copyright 2013 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/android/bookmarks/bookmarks_bridge.h"
 
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
+#include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/BookmarksBridge_jni.h"
 
@@ skipping 205 matching lines @@
       node->id(),
       GetBookmarkType(node),
       ConvertUTF16ToJavaString(env, GetTitle(node)).obj(),
       ConvertUTF8ToJavaString(env, url).obj(),
       node->is_folder(),
       parent_id,
       GetBookmarkType(parent),
       IsEditable(node));
 }
 
-void BookmarksBridge::ExtractBookmarkNodeInformation(
-    const BookmarkNode* node,
-    jobject j_result_obj) {
+void BookmarksBridge::ExtractBookmarkNodeInformation(const BookmarkNode* node,
+                                                     jobject j_result_obj) {
   JNIEnv* env = AttachCurrentThread();
   if (!IsReachable(node))
     return;
   Java_BookmarksBridge_addToList(
-      env,
-      j_result_obj,
-      CreateJavaBookmark(node).obj());
+      env, j_result_obj, CreateJavaBookmark(node).obj());
 }
 
-const BookmarkNode* BookmarksBridge::GetNodeByID(long node_id,
-                                                 int type) {
+const BookmarkNode* BookmarksBridge::GetNodeByID(long node_id, int type) {
   const BookmarkNode* node;
   if (type == kBookmarkTypeManaged) {
     node = managed_bookmarks_shim_->GetNodeByID(
         static_cast<int64>(node_id));
   } else if (type == kBookmarkTypePartner) {
     node = partner_bookmarks_shim_->GetNodeByID(
         static_cast<int64>(node_id));
   } else {
-    node = bookmark_model_->GetNodeByID(static_cast<int64>(node_id));
+    node = GetBookmarkNodeByID(bookmark_model_, static_cast<int64>(node_id));
   }
   return node;
 }
 
-const BookmarkNode* BookmarksBridge::GetFolderWithFallback(
-    long folder_id, int type) {
+const BookmarkNode* BookmarksBridge::GetFolderWithFallback(long folder_id,
+                                                           int type) {
   const BookmarkNode* folder = GetNodeByID(folder_id, type);
   if (!folder || folder->type() == BookmarkNode::URL ||
       !IsFolderAvailable(folder)) {
     folder = bookmark_model_->mobile_node();
   }
   return folder;
 }
 
 bool BookmarksBridge::IsEditable(const BookmarkNode* node) const {
   if (!node || (node->type() != BookmarkNode::FOLDER &&
@@ skipping 215 matching lines @@
   BookmarkModelChanged();
 }
 
 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) {
   NotifyIfDoneLoading();
 }
 
 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) {
   partner_bookmarks_shim_ = NULL;
 }