Add Instrumental Test for BookmarksBridge

chrome/browser/android/bookmarks/bookmarks_bridge.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_
 #define CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
@@ skipping 13 matching lines @@
 class BookmarksBridge : public BaseBookmarkModelObserver,
                         public PartnerBookmarksShim::Observer {
  public:
   BookmarksBridge(JNIEnv* env, jobject obj, jobject j_profile);
   void Destroy(JNIEnv*, jobject);
 
   static bool RegisterBookmarksBridge(JNIEnv* env);
 
   bool IsDoingExtensiveChanges(JNIEnv* env, jobject obj);
 
+  void LoadEmptyPartnerBookmarkShimForTesting(JNIEnv* env, jobject obj);
+
   base::android::ScopedJavaLocalRef<jobject> GetBookmarkByID(
       JNIEnv* env,
       jobject obj,
       jlong id,
       jint type);
 
   void GetPermanentNodeIDs(JNIEnv* env,
                            jobject obj,
                            jobject j_result_obj);
 
@@ skipping 11 matching lines @@
                                    jobject obj,
                                    jobject j_result_obj);
   void GetAllFoldersWithDepths(JNIEnv* env,
                                jobject obj,
                                jobject j_folders_obj,
                                jobject j_depths_obj);
 
   base::android::ScopedJavaLocalRef<jobject> GetMobileFolderId(JNIEnv* env,
                                                                jobject obj);
 
+  base::android::ScopedJavaLocalRef<jobject> GetOtherFolderId(JNIEnv* env,
+                                                              jobject obj);
+
+  base::android::ScopedJavaLocalRef<jobject> GetDesktopFolderId(JNIEnv* env,
+                                                                jobject obj);
+
   void GetChildIDs(JNIEnv* env,
                    jobject obj,
                    jlong id,
                    jint type,
                    jboolean get_folders,
                    jboolean get_bookmarks,
                    jobject j_result_obj);
 
   void GetAllBookmarkIDsOrderedByCreationDate(JNIEnv* env,
                                               jobject obj,
@@ skipping 18 matching lines @@
                              jobject j_folder_id_obj,
                              jobject j_callback_obj,
                              jobject j_result_obj);
 
   void GetCurrentFolderHierarchy(JNIEnv* env,
                                  jobject obj,
                                  jobject j_folder_id_obj,
                                  jobject j_callback_obj,
                                  jobject j_result_obj);
 
-  void DeleteBookmark(JNIEnv* env,
-                      jobject obj,
-                      jobject j_bookmark_id_obj);
+  base::android::ScopedJavaLocalRef<jobject> AddFolder(JNIEnv* env,
+                                                       jobject obj,
+                                                       jobject j_parent_id_obj,
+                                                       jint index,
+                                                       jstring j_title);
+
+  void DeleteBookmark(JNIEnv* env, jobject obj, jobject j_bookmark_id_obj);

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

This doesn't seem to have a java counterpart...nor is it implemented in the .cc
file.

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

This is not a newly created function. It has been in both cc and java files
since long time ago.

 
   void MoveBookmark(JNIEnv* env,
                     jobject obj,
                     jobject j_bookmark_id_obj,
                     jobject j_parent_id_obj,
                     jint index);
 
+  base::android::ScopedJavaLocalRef<jobject> AddBookmark(
+      JNIEnv* env,
+      jobject obj,
+      jobject j_parent_id_obj,
+      jint index,
+      jstring j_title,
+      jstring j_url);
+
  private:
   virtual ~BookmarksBridge();
 
   base::android::ScopedJavaLocalRef<jobject> CreateJavaBookmark(
       const BookmarkNode* node);
   void ExtractBookmarkNodeInformation(
       const BookmarkNode* node,
       jobject j_result_obj);
   const BookmarkNode* GetNodeByID(long node_id, int type);
   const BookmarkNode* GetFolderWithFallback(long folder_id, int type);
@@ skipping 48 matching lines @@
   ChromeBookmarkClient* client_;   // weak
 
   // Information about the Partner bookmarks (must check for IsLoaded()).
   // This is owned by profile.
   PartnerBookmarksShim* partner_bookmarks_shim_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarksBridge);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_