Extract GetNodeByID() method from BookmarkModel.

chrome/browser/android/provider/chrome_browser_provider.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/android/provider/chrome_browser_provider.h"
 
 #include <list>
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "chrome/browser/android/provider/blocking_ui_thread_async_request.h"
 #include "chrome/browser/android/provider/bookmark_model_observer_task.h"
 #include "chrome/browser/android/provider/run_on_ui_thread_blocking.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/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/android/android_history_types.h"
 #include "chrome/browser/history/android/sqlite_cursor.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 180 matching lines @@
                             int64* result) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK(result);
     GURL gurl = ParseAndMaybeAppendScheme(url, kDefaultUrlScheme);
 
     // Check if the bookmark already exists.
     const BookmarkNode* node = model->GetMostRecentlyAddedNodeForURL(gurl);
     if (!node) {
       const BookmarkNode* parent_node = NULL;
       if (parent_id >= 0)
-        parent_node = model->GetNodeByID(parent_id);
+        parent_node = GetBookmarkNodeByID(model, parent_id);
       if (!parent_node)
         parent_node = model->bookmark_bar_node();
 
       if (is_folder)
         node = model->AddFolder(parent_node, parent_node->child_count(), title);
       else
         node = model->AddURL(parent_node, 0, title, gurl);
     }
 
     *result = node ? node ->id() : kInvalidBookmarkId;
@@ skipping 14 matching lines @@
 
   int Run(const int64 id) {
     id_to_delete_ = id;
     RunOnUIThreadBlocking::Run(
         base::Bind(&RemoveBookmarkTask::RunOnUIThread, model(), id));
     return deleted_;
   }
 
   static void RunOnUIThread(BookmarkModel* model, const int64 id) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-    const BookmarkNode* node = model->GetNodeByID(id);
+    const BookmarkNode* node = GetBookmarkNodeByID(model, id);
     if (node && node->parent()) {
       const BookmarkNode* parent_node = node->parent();
       model->Remove(parent_node, parent_node->GetIndexOf(node));
     }
   }
 
   // Verify that the bookmark was actually removed. Called synchronously.
   virtual void BookmarkNodeRemoved(BookmarkModel* bookmark_model,
                                    const BookmarkNode* parent,
                                    int old_index,
@@ skipping 50 matching lines @@
                    model(), id, title, url, parent_id));
     return updated_;
   }
 
   static void RunOnUIThread(BookmarkModel* model,
                             const int64 id,
                             const base::string16& title,
                             const base::string16& url,
                             const int64 parent_id) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-    const BookmarkNode* node = model->GetNodeByID(id);
+    const BookmarkNode* node = GetBookmarkNodeByID(model, id);
     if (node) {
       if (node->GetTitle() != title)
         model->SetTitle(node, title);
 
       if (node->type() == BookmarkNode::URL) {
         GURL bookmark_url = ParseAndMaybeAppendScheme(url, kDefaultUrlScheme);
         if (bookmark_url != node->url())
           model->SetURL(node, bookmark_url);
       }
 
       if (parent_id >= 0 &&
           (!node->parent() || parent_id != node->parent()->id())) {
-        const BookmarkNode* new_parent = model->GetNodeByID(parent_id);
+        const BookmarkNode* new_parent = GetBookmarkNodeByID(model, parent_id);
 
         if (new_parent)
           model->Move(node, new_parent, 0);
       }
     }
   }
 
   // Verify that the bookmark was actually updated. Called synchronously.
   virtual void BookmarkNodeChanged(BookmarkModel* bookmark_model,
                                    const BookmarkNode* node) OVERRIDE {
@@ skipping 21 matching lines @@
         base::Bind(&BookmarkNodeExistsTask::RunOnUIThread,
                    model(), id, &result));
     return result;
   }
 
   static void RunOnUIThread(BookmarkModel* model,
                             const int64 id,
                             bool* result) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK(result);
-    *result = model->GetNodeByID(id) != NULL;
+    *result = GetBookmarkNodeByID(model, id) != NULL;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BookmarkNodeExistsTask);
 };
 
 // Checks if a node belongs to the Mobile Bookmarks hierarchy branch.
 class IsInMobileBookmarksBranchTask : public BookmarkModelTask {
  public:
   explicit IsInMobileBookmarksBranchTask(BookmarkModel* model)
       : BookmarkModelTask(model) {}
 
   bool Run(const int64 id) {
     bool result = false;
     RunOnUIThreadBlocking::Run(
         base::Bind(&IsInMobileBookmarksBranchTask::RunOnUIThread,
                    model(), id, &result));
     return result;
   }
 
   static void RunOnUIThread(BookmarkModel* model,
                             const int64 id,
                             bool *result) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK(result);
-    const BookmarkNode* node = model->GetNodeByID(id);
+    const BookmarkNode* node = GetBookmarkNodeByID(model, id);
     const BookmarkNode* mobile_node = model->mobile_node();
     while (node && node != mobile_node)
       node = node->parent();
 
     *result = node == mobile_node;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(IsInMobileBookmarksBranchTask);
 };
@@ skipping 16 matching lines @@
 
   static void RunOnUIThread(BookmarkModel* model,
                             const base::string16& title,
                             const int64 parent_id,
                             int64* result) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK(result);
 
     // Invalid ids are assumed to refer to the Mobile Bookmarks folder.
     const BookmarkNode* parent = parent_id >= 0 ?
-        model->GetNodeByID(parent_id) : model->mobile_node();
+        GetBookmarkNodeByID(model, parent_id) : model->mobile_node();
     DCHECK(parent);
 
     bool in_mobile_bookmarks;
     IsInMobileBookmarksBranchTask::RunOnUIThread(model, parent->id(),
                                                  &in_mobile_bookmarks);
     if (!in_mobile_bookmarks) {
       // The parent folder must be inside the Mobile Bookmarks folder.
       *result = kInvalidBookmarkId;
       return;
     }
@@ skipping 83 matching lines @@
         base::Bind(&GetBookmarkNodeTask::RunOnUIThread,
                    model(), id, get_parent, get_children, jnode));
   }
 
   static void RunOnUIThread(BookmarkModel* model,
                             const int64 id,
                             bool get_parent,
                             bool get_children,
                             ScopedJavaGlobalRef<jobject>* jnode) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-    const BookmarkNode* node = model->GetNodeByID(id);
+    const BookmarkNode* node = GetBookmarkNodeByID(model, id);
     if (!node || !jnode)
       return;
 
     ScopedJavaGlobalRef<jobject> jparent;
     if (get_parent) {
       ConvertBookmarkNode(node->parent(), ScopedJavaLocalRef<jobject>(),
                           &jparent);
     }
 
     ConvertBookmarkNode(node, jparent, jnode);
@@ skipping 1052 matching lines @@
     Java_ChromeBrowserProvider_onBookmarkChanged(env, obj.obj());
   } else if (type ==
       chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED) {
     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env);
     if (obj.is_null())
       return;
     Java_ChromeBrowserProvider_onSearchTermChanged(env, obj.obj());
   }
 }