Add Search Service in Enhanced Bookmark Bridge

chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc

 // Copyright 2014 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/enhanced_bookmarks/enhanced_bookmarks_bridge.h"
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service.h"
 #include "chrome/browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service_factory.h"
 #include "chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile_android.h"
+#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/common/android/bookmark_id.h"
 #include "components/bookmarks/common/android/bookmark_type.h"
 #include "components/enhanced_bookmarks/enhanced_bookmark_model.h"
+#include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/EnhancedBookmarksBridge_jni.h"
 
 using base::android::AttachCurrentThread;
 using bookmarks::android::JavaBookmarkIdCreateBookmarkId;
 using bookmarks::android::JavaBookmarkIdGetId;
 using bookmarks::android::JavaBookmarkIdGetType;
 using bookmarks::BookmarkType;
 using content::BrowserThread;
 
 namespace enhanced_bookmarks {
 namespace android {
 
 EnhancedBookmarksBridge::EnhancedBookmarksBridge(JNIEnv* env,
     jobject obj,
     Profile* profile) : weak_java_ref_(env, obj) {
   profile_ = profile;
   enhanced_bookmark_model_ =
       EnhancedBookmarkModelFactory::GetForBrowserContext(profile_);
   enhanced_bookmark_model_->SetVersionSuffix(chrome::VersionInfo().OSType());
   cluster_service_ =
       ChromeBookmarkServerClusterServiceFactory::GetForBrowserContext(profile_);
   cluster_service_->AddObserver(this);
+  search_service_.reset(new BookmarkServerSearchService(
+      profile_->GetRequestContext(),
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile_),
+      SigninManagerFactory::GetForProfile(profile_),
+      EnhancedBookmarkModelFactory::GetForBrowserContext(profile_)));
+  search_service_->AddObserver(this);
 }
 
 EnhancedBookmarksBridge::~EnhancedBookmarksBridge() {
   cluster_service_->RemoveObserver(this);
+  search_service_->RemoveObserver(this);
 }
 
 void EnhancedBookmarksBridge::Destroy(JNIEnv*, jobject) {
   delete this;
 }
 
 ScopedJavaLocalRef<jstring> EnhancedBookmarksBridge::GetBookmarkDescription(
     JNIEnv* env, jobject obj, jlong id, jint type) {
   DCHECK(enhanced_bookmark_model_->loaded());
   DCHECK_EQ(BookmarkType::BOOKMARK_TYPE_NORMAL, type);
@@ skipping 33 matching lines @@
   for (const BookmarkNode* node : bookmarks) {
     Java_EnhancedBookmarksBridge_addToBookmarkIdList(
         env, j_result_obj, node->id(), node->type());
   }
 }
 
 ScopedJavaLocalRef<jobjectArray> EnhancedBookmarksBridge::GetFilters(
     JNIEnv* env,
     jobject obj) {
   DCHECK(enhanced_bookmark_model_->loaded());
-  const std::vector<std::string> filters =
-      cluster_service_->GetClusters();
+  const std::vector<std::string> filters = cluster_service_->GetClusters();
   return base::android::ToJavaArrayOfStrings(env, filters);
 }
 
 ScopedJavaLocalRef<jobject> EnhancedBookmarksBridge::AddFolder(JNIEnv* env,
     jobject obj,
     jobject j_parent_id_obj,
     jint index,
     jstring j_title) {
   DCHECK(enhanced_bookmark_model_->loaded());
   long bookmark_id = JavaBookmarkIdGetId(env, j_parent_id_obj);
@@ skipping 55 matching lines @@
       base::Time::Now());
   if (!new_node) {
     NOTREACHED();
     return ScopedJavaLocalRef<jobject>();
   }
   ScopedJavaLocalRef<jobject> new_java_obj =
       JavaBookmarkIdCreateBookmarkId(env, new_node->id(), new_node->type());
   return new_java_obj;
 }
 
+void EnhancedBookmarksBridge::SendSearchRequest(JNIEnv* env,
+                                                jobject obj,
+                                                jstring j_query) {
+  search_service_->Search(base::android::ConvertJavaStringToUTF8(env, j_query));
+}
+
+ScopedJavaLocalRef<jobject> EnhancedBookmarksBridge::GetSearchResults(
+    JNIEnv* env,
+    jobject obj,
+    jstring j_query) {
+  DCHECK(enhanced_bookmark_model_->loaded());
+
+  ScopedJavaLocalRef<jobject> j_list =
+          Java_EnhancedBookmarksBridge_createBookmarkIdList(env);
+  scoped_ptr<std::vector<const BookmarkNode*>> results =
+      search_service_->ResultForQuery(
+          base::android::ConvertJavaStringToUTF8(env, j_query));
+
+  // If result is null, return a null java reference.
+  if (!results.get())
+    return ScopedJavaLocalRef<jobject>();
+
+  for (const BookmarkNode* node : *results) {
+    Java_EnhancedBookmarksBridge_addToBookmarkIdList(env, j_list.obj(),
+                                                     node->id(), node->type());
+  }
+  return j_list;
+}
+
 void EnhancedBookmarksBridge::OnChange(BookmarkServerService* service) {
   DCHECK(enhanced_bookmark_model_->loaded());
   JNIEnv* env = AttachCurrentThread();
 
   ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env);
   if (obj.is_null())
     return;
 
-  Java_EnhancedBookmarksBridge_onFiltersChanged(env, obj.obj());
+  if (service == cluster_service_) {
+    Java_EnhancedBookmarksBridge_onFiltersChanged(env, obj.obj());
+  } else if (service == search_service_.get()){
+    Java_EnhancedBookmarksBridge_onSearchResultReturned(env, obj.obj());
+  }
 }
 
 bool EnhancedBookmarksBridge::IsEditable(const BookmarkNode* node) const {
   if (!node || (node->type() != BookmarkNode::FOLDER &&
       node->type() != BookmarkNode::URL)) {
     return false;
   }
   return profile_->GetPrefs()->GetBoolean(
         bookmarks::prefs::kEditBookmarksEnabled);
 }
 
 static jlong Init(JNIEnv* env, jobject obj, jobject j_profile) {
   return reinterpret_cast<jlong>(new EnhancedBookmarksBridge(
         env, obj, ProfileAndroid::FromProfileAndroid(j_profile)));
 }
 
 bool RegisterEnhancedBookmarksBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace enhanced_bookmarks