Add JNI bridges for EnhancedBookmark Create/AddFolder/Move

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/containers/stack_container.h"
 #include "base/i18n/string_compare.h"
 #include "base/prefs/pref_service.h"
@@ skipping 15 matching lines @@
 #include "components/bookmarks/common/android/bookmark_type.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/BookmarksBridge_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ScopedJavaLocalRef;
 using base::android::ScopedJavaGlobalRef;
+using bookmarks::android::JavaBookmarkIdCreateBookmarkId;
 using bookmarks::android::JavaBookmarkIdGetId;
 using bookmarks::android::JavaBookmarkIdGetType;
 using bookmarks::BookmarkType;
 using content::BrowserThread;
 
 namespace {
 
 class BookmarkNodeCreationTimeCompareFunctor {
  public:
   bool operator()(const BookmarkNode* lhs, const BookmarkNode* rhs) {
@@ skipping 310 matching lines @@
          ++it) {
       stk.push(std::make_pair(*it, depth + 1));
     }
   }
 }
 
 ScopedJavaLocalRef<jobject> BookmarksBridge::GetMobileFolderId(JNIEnv* env,
                                                                jobject obj) {
   const BookmarkNode* mobile_node = bookmark_model_->mobile_node();
   ScopedJavaLocalRef<jobject> folder_id_obj =
-      Java_BookmarksBridge_createBookmarkId(
+      JavaBookmarkIdCreateBookmarkId(
           env, mobile_node->id(), GetBookmarkType(mobile_node));
   return folder_id_obj;
 }
 
 ScopedJavaLocalRef<jobject> BookmarksBridge::GetOtherFolderId(JNIEnv* env,
                                                               jobject obj) {
   const BookmarkNode* other_node = bookmark_model_->other_node();
   ScopedJavaLocalRef<jobject> folder_id_obj =
-      Java_BookmarksBridge_createBookmarkId(
+      JavaBookmarkIdCreateBookmarkId(
           env, other_node->id(), GetBookmarkType(other_node));
   return folder_id_obj;
 }
 
 ScopedJavaLocalRef<jobject> BookmarksBridge::GetDesktopFolderId(JNIEnv* env,
                                                                 jobject obj) {
   const BookmarkNode* desktop_node = bookmark_model_->bookmark_bar_node();
   ScopedJavaLocalRef<jobject> folder_id_obj =
-      Java_BookmarksBridge_createBookmarkId(
+      JavaBookmarkIdCreateBookmarkId(
           env, desktop_node->id(), GetBookmarkType(desktop_node));
   return folder_id_obj;
 }
 
 void BookmarksBridge::GetChildIDs(JNIEnv* env,
                                   jobject obj,
                                   jlong id,
                                   jint type,
                                   jboolean get_folders,
                                   jboolean get_bookmarks,
@@ skipping 32 matching lines @@
 ScopedJavaLocalRef<jobject> BookmarksBridge::GetChildAt(JNIEnv* env,
                                                         jobject obj,
                                                         jlong id,
                                                         jint type,
                                                         jint index) {
   DCHECK(IsLoaded());
 
   const BookmarkNode* parent = GetNodeByID(id, type);
   DCHECK(parent);
   const BookmarkNode* child = parent->GetChild(index);
-  return Java_BookmarksBridge_createBookmarkId(
+  return JavaBookmarkIdCreateBookmarkId(
       env, child->id(), GetBookmarkType(child));
 }
 
 void BookmarksBridge::GetAllBookmarkIDsOrderedByCreationDate(
     JNIEnv* env,
     jobject obj,
     jobject j_result_obj) {
   DCHECK(IsLoaded());
   std::list<const BookmarkNode*> folders;
   std::vector<const BookmarkNode*> result;
@@ skipping 77 matching lines @@
   DCHECK(IsLoaded());
   long folder_id = JavaBookmarkIdGetId(env, j_folder_id_obj);
   int type = JavaBookmarkIdGetType(env, j_folder_id_obj);
   const BookmarkNode* folder = GetFolderWithFallback(folder_id, type);
 
   if (!folder->is_folder() || !IsReachable(folder))
     return;
 
   // Recreate the java bookmarkId object due to fallback.
   ScopedJavaLocalRef<jobject> folder_id_obj =
-      Java_BookmarksBridge_createBookmarkId(
+      JavaBookmarkIdCreateBookmarkId(
           env, folder->id(), GetBookmarkType(folder));
   j_folder_id_obj = folder_id_obj.obj();
 
   // Get the folder contents.
   for (int i = 0; i < folder->child_count(); ++i) {
     const BookmarkNode* node = folder->GetChild(i);
     if (!IsFolderAvailable(node))
       continue;
     ExtractBookmarkNodeInformation(node, j_result_obj);
   }
@@ skipping 19 matching lines @@
   DCHECK(IsLoaded());
   long folder_id = JavaBookmarkIdGetId(env, j_folder_id_obj);
   int type = JavaBookmarkIdGetType(env, j_folder_id_obj);
   const BookmarkNode* folder = GetFolderWithFallback(folder_id, type);
 
   if (!folder->is_folder() || !IsReachable(folder))
     return;
 
   // Recreate the java bookmarkId object due to fallback.
   ScopedJavaLocalRef<jobject> folder_id_obj =
-      Java_BookmarksBridge_createBookmarkId(
+      JavaBookmarkIdCreateBookmarkId(
           env, folder->id(), GetBookmarkType(folder));
   j_folder_id_obj = folder_id_obj.obj();
 
   // Get the folder hierarchy.
   const BookmarkNode* node = folder;
   while (node) {
     ExtractBookmarkNodeInformation(node, j_result_obj);
     node = GetParentNode(node);
   }
 
@@ skipping 11 matching lines @@
   int type = JavaBookmarkIdGetType(env, j_parent_id_obj);
   const BookmarkNode* parent = GetNodeByID(bookmark_id, type);
 
   const BookmarkNode* new_node = bookmark_model_->AddFolder(
       parent, index, base::android::ConvertJavaStringToUTF16(env, j_title));
   if (!new_node) {
     NOTREACHED();
     return ScopedJavaLocalRef<jobject>();
   }
   ScopedJavaLocalRef<jobject> new_java_obj =
-      Java_BookmarksBridge_createBookmarkId(
+      JavaBookmarkIdCreateBookmarkId(
           env, new_node->id(), GetBookmarkType(new_node));
   return new_java_obj;
 }
 
 void BookmarksBridge::DeleteBookmark(JNIEnv* env,
                                      jobject obj,
                                      jobject j_bookmark_id_obj) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(IsLoaded());
 
@@ skipping 49 matching lines @@
   const BookmarkNode* new_node = bookmark_model_->AddURL(
       parent,
       index,
       base::android::ConvertJavaStringToUTF16(env, j_title),
       GURL(base::android::ConvertJavaStringToUTF16(env, j_url)));
   if (!new_node) {
     NOTREACHED();
     return ScopedJavaLocalRef<jobject>();
   }
   ScopedJavaLocalRef<jobject> new_java_obj =
-      Java_BookmarksBridge_createBookmarkId(
+      JavaBookmarkIdCreateBookmarkId(
           env, new_node->id(), GetBookmarkType(new_node));
   return new_java_obj;
 }
 
 void BookmarksBridge::Undo(JNIEnv* env, jobject obj) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(IsLoaded());
   BookmarkUndoService* undo_service =
       BookmarkUndoServiceFactory::GetForProfile(profile_);
   UndoManager* undo_manager = undo_service->undo_manager();
@@ skipping 293 matching lines @@
   BookmarkModelChanged();
 }
 
 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) {
   NotifyIfDoneLoading();
 }
 
 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) {
   partner_bookmarks_shim_ = NULL;
 }