Add local search API to Enhanced Bookmark Bridge

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 9ab94fed75ea79440756ce9c8ba5729a9eb3656c..e6c0e0eebd004da3972155a6a300d33a092fc815 100644
--- a/chrome/browser/android/bookmarks/bookmarks_bridge.cc
+++ b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
@@ -20,6 +20,7 @@
 #include "chrome/browser/undo/bookmark_undo_service_factory.h"
 #include "chrome/browser/undo/undo_manager.h"
 #include "chrome/common/pref_names.h"
+#include "components/bookmarks/browser/bookmark_match.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h"
@@ -653,6 +654,27 @@ void BookmarksBridge::MoveBookmark(JNIEnv* env,
   bookmark_model_->Move(node, new_parent_node, index);
 }
 
+ScopedJavaLocalRef<jobject> BookmarksBridge::SearchLocalResults(
+    JNIEnv* env,
+    jobject obj,
+    jstring j_query,
+    jint max_results) {
+  DCHECK(bookmark_model_->loaded());
+
+  ScopedJavaLocalRef<jobject> j_list =
+            Java_BookmarksBridge_createBookmarkIdList(env);

[Ted C, 2014/10/31 20:53:07]

indented too much, and create this above the for loop below since that is where
it's used

[Ian Wen, 2014/10/31 21:28:23]

Done.

+  std::vector<bookmarks::BookmarkMatch> results;
+  bookmark_model_->GetBookmarksMatching(
+      base::android::ConvertJavaStringToUTF16(env, j_query),
+      max_results, &results);

[Ted C, 2014/10/31 20:53:07]

&results needs to go on it's own line

[Ian Wen, 2014/10/31 21:28:23]

Done.

+  for (const bookmarks::BookmarkMatch& match : results) {
+    const BookmarkNode* node = match.node;
+    Java_BookmarksBridge_addToBookmarkIdList(env, j_list.obj(), node->id(),

[Ted C, 2014/10/31 20:53:07]

If all the params don't fit on a single line, they all go on their own.

With that said, all the params should fit on the second line.

[Ian Wen, 2014/10/31 21:28:23]

Done. Eclipse auto formatter is no silver bullet. :(

+                                             node->type());
+  }
+  return j_list;
+}
+
 ScopedJavaLocalRef<jobject> BookmarksBridge::AddBookmark(
     JNIEnv* env,
     jobject obj,