Merge 235499 "Fix a small bug in bookmarks_bridge.cc"

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"
@@ skipping 69 matching lines @@
 
 void BookmarksBridge::GetBookmarksForFolder(JNIEnv* env,
                                             jobject obj,
                                             jobject j_folder_id_obj,
                                             jobject j_callback_obj,
                                             jobject j_result_obj) {
   DCHECK(bookmark_model_->loaded());
   long folder_id = Java_BookmarkId_getId(env, j_folder_id_obj);
   int type = Java_BookmarkId_getType(env, j_folder_id_obj);
   const BookmarkNode* folder = GetFolderWithFallback(folder_id, type);
+  // Recreate the java bookmarkId object due to fallback.
+  ScopedJavaLocalRef<jobject> folder_id_obj =
+      Java_BookmarksBridge_createBookmarkId(
+          env, folder->id(), GetBookmarkType(folder));
+  j_folder_id_obj = folder_id_obj.obj();
+
   // If this is the Mobile bookmarks folder then add the "Managed bookmarks"
   // folder first, so that it's the first entry.
   if (folder == bookmark_model_->mobile_node() &&
       managed_bookmarks_shim_->HasManagedBookmarks()) {
     ExtractBookmarkNodeInformation(
         managed_bookmarks_shim_->GetManagedBookmarksRoot(),
         j_result_obj);
   }
   // Get the folder contents
   for (int i = 0; i < folder->child_count(); ++i) {
     const BookmarkNode* node = folder->GetChild(i);
     ExtractBookmarkNodeInformation(node, j_result_obj);
   }
 
   Java_BookmarksCallback_onBookmarksAvailable(
       env, j_callback_obj, j_folder_id_obj, j_result_obj);
 }
 
 void BookmarksBridge::GetCurrentFolderHierarchy(JNIEnv* env,
                                                 jobject obj,
                                                 jobject j_folder_id_obj,
                                                 jobject j_callback_obj,
                                                 jobject j_result_obj) {
   DCHECK(bookmark_model_->loaded());
   long folder_id = Java_BookmarkId_getId(env, j_folder_id_obj);
   int type = Java_BookmarkId_getType(env, j_folder_id_obj);
   const BookmarkNode* folder = GetFolderWithFallback(folder_id, type);
+  // Recreate the java bookmarkId object due to fallback.
+  ScopedJavaLocalRef<jobject> folder_id_obj =
+      Java_BookmarksBridge_createBookmarkId(
+          env, folder->id(), GetBookmarkType(folder));
+  j_folder_id_obj = folder_id_obj.obj();
+
   // Get the folder heirarchy
   const BookmarkNode* node = folder;
   while (node) {
     ExtractBookmarkNodeInformation(node, j_result_obj);
     node = GetParentNode(node);
   }
 
   Java_BookmarksCallback_onBookmarksFolderHierarchyAvailable(
       env, j_callback_obj, j_folder_id_obj, j_result_obj);
 }
@@ skipping 204 matching lines @@
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_BookmarksBridge_extensiveBookmarkChangesEnded(env, obj.obj());
 }
 
 void BookmarksBridge::OnManagedBookmarksChanged() {
   BookmarkModelChanged();
 }