Add Instrumental Test for BookmarksBridge

chrome/browser/android/bookmarks/bookmarks_bridge.cc

Index: chrome/browser/android/bookmarks/bookmarks_bridge.cc
diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.cc b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
index 55fa1ac0bbc97fa6f560bd4a4b005a59be4c554d..aaa814e468a68cbf0e024432f6f3d91e38aa6651 100644
--- a/chrome/browser/android/bookmarks/bookmarks_bridge.cc
+++ b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
@@ -146,6 +146,14 @@ static jboolean IsEditBookmarksEnabled(JNIEnv* env, jclass clazz) {
   return IsEditBookmarksEnabled();
 }
 
+void BookmarksBridge::LoadEmptyPartnerBookmarkShimForTesting(JNIEnv* env,
+                                                             jobject obj) {
+  if (partner_bookmarks_shim_->IsLoaded()) return;

[Ted C, 2014/09/16 02:03:52]

in c++, the return goes on the next line.

It is fine to have no parens in the c++ case for single line
conditional/statement combinations.

[Ian Wen, 2014/09/16 20:31:34]

Done.

+  partner_bookmarks_shim_->SetPartnerBookmarksRoot(
+      new BookmarkPermanentNode(0));
+  DCHECK(partner_bookmarks_shim_->IsLoaded());
+}
+
 ScopedJavaLocalRef<jobject> BookmarksBridge::GetBookmarkByID(JNIEnv* env,
                                                              jobject obj,
                                                              jlong id,
@@ -363,6 +371,24 @@ ScopedJavaLocalRef<jobject> BookmarksBridge::GetMobileFolderId(JNIEnv* env,
   return folder_id_obj;
 }
 
+ScopedJavaLocalRef<jobject> BookmarksBridge::GetOtherFolderId(JNIEnv* env,
+                                                              jobject obj) {
+  const BookmarkNode* otherNode = bookmark_model_->other_node();

[Ted C, 2014/09/16 02:03:52]

s/otherNode/other_node

[Ian Wen, 2014/09/16 20:31:34]

Done.

+  ScopedJavaLocalRef<jobject> folder_id_obj =
+      Java_BookmarksBridge_createBookmarkId(
+          env, otherNode->id(), GetBookmarkType(otherNode));
+  return folder_id_obj;
+}
+
+ScopedJavaLocalRef<jobject> BookmarksBridge::GetDesktopFolderId(JNIEnv* env,
+                                                                jobject obj) {
+  const BookmarkNode* desktopNode = bookmark_model_->bookmark_bar_node();

[Ted C, 2014/09/16 02:03:52]

s/desktopNode/desktop_node

[Ian Wen, 2014/09/16 20:31:34]

Done.

+  ScopedJavaLocalRef<jobject> folder_id_obj =
+      Java_BookmarksBridge_createBookmarkId(
+          env, desktopNode->id(), GetBookmarkType(desktopNode));
+  return folder_id_obj;
+}
+
 void BookmarksBridge::GetChildIDs(JNIEnv* env,
                                   jobject obj,
                                   jlong id,
@@ -550,6 +576,27 @@ void BookmarksBridge::GetCurrentFolderHierarchy(JNIEnv* env,
       env, j_callback_obj, j_folder_id_obj, j_result_obj);
 }
 
+ScopedJavaLocalRef<jobject> BookmarksBridge::AddFolder(JNIEnv* env,
+                                                       jobject obj,
+                                                       jobject j_parent_id_obj,
+                                                       jint index,
+                                                       jstring j_title) {
+  DCHECK(IsLoaded());
+  long bookmark_id = JavaBookmarkIdGetId(env, j_parent_id_obj);
+  int type = JavaBookmarkIdGetType(env, j_parent_id_obj);
+  const BookmarkNode* parent = GetNodeByID(bookmark_id, type);
+  if (type != BookmarkType::NORMAL) {
+    NOTREACHED();
+    return ScopedJavaLocalRef<jobject>();
+  }
+  const BookmarkNode* newNode = bookmark_model_->AddFolder(

[Ted C, 2014/09/16 02:03:52]

s/newNode/new_node

[Ted C, 2014/09/16 02:03:53]

I would add a blank line above this line as well.

Also, this can return null if passed an invalid ID.  Then it will just crash on
the next line as you call ->id() on it.

[Ian Wen, 2014/09/16 20:31:34]

Done.

+      parent, index, base::android::ConvertJavaStringToUTF16(env, j_title));
+  ScopedJavaLocalRef<jobject> new_java_obj =
+      Java_BookmarksBridge_createBookmarkId(
+          env, newNode->id(), GetBookmarkType(newNode));
+  return new_java_obj;
+}
+
 void BookmarksBridge::DeleteBookmark(JNIEnv* env,
                                      jobject obj,
                                      jobject j_bookmark_id_obj) {
@@ -593,6 +640,32 @@ void BookmarksBridge::MoveBookmark(JNIEnv* env,
   bookmark_model_->Move(node, new_parent_node, index);
 }
 
+ScopedJavaLocalRef<jobject> BookmarksBridge::AddBookmark(
+    JNIEnv* env,
+    jobject obj,
+    jobject j_parent_id_obj,
+    jint index,
+    jstring j_title,
+    jstring j_url) {
+  DCHECK(IsLoaded());
+  long bookmark_id = JavaBookmarkIdGetId(env, j_parent_id_obj);
+  int type = JavaBookmarkIdGetType(env, j_parent_id_obj);
+  const BookmarkNode* parent = GetNodeByID(bookmark_id, type);
+  if (type != BookmarkType::NORMAL) {
+    NOTREACHED();
+    return ScopedJavaLocalRef<jobject>();
+  }
+  const BookmarkNode* newNode = bookmark_model_->AddURL(

[Ted C, 2014/09/16 02:03:52]

s/newNode/new_node

Blank line here too

[Ian Wen, 2014/09/16 20:31:34]

Done.

+      parent,
+      index,
+      base::android::ConvertJavaStringToUTF16(env, j_title),
+      GURL(base::android::ConvertJavaStringToUTF16(env, j_url)));
+  ScopedJavaLocalRef<jobject> new_java_obj =
+      Java_BookmarksBridge_createBookmarkId(
+          env, newNode->id(), GetBookmarkType(newNode));
+  return new_java_obj;
+}
+
 ScopedJavaLocalRef<jobject> BookmarksBridge::CreateJavaBookmark(
     const BookmarkNode* node) {
   JNIEnv* env = AttachCurrentThread();