[Android] Remove search feature from enhanced bookmarks

chrome/browser/enhanced_bookmarks/android/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/enhanced_bookmarks/android/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"
@@ skipping 62 matching lines @@
     Profile* profile) : weak_java_ref_(env, obj) {
   profile_ = profile;
   enhanced_bookmark_model_ =
       EnhancedBookmarkModelFactory::GetForBrowserContext(profile_);
   enhanced_bookmark_model_->SetVersionSuffix(chrome::VersionInfo().OSType());
   cluster_service_ =
       BookmarkServerClusterServiceFactory::GetForBrowserContext(profile_);
   cluster_service_->AddObserver(this);
   bookmark_image_service_ = static_cast<BookmarkImageServiceAndroid*>(
       BookmarkImageServiceFactory::GetForBrowserContext(profile_));
-  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;
 }
 
 void EnhancedBookmarksBridge::SalientImageForUrl(JNIEnv* env,
                                                  jobject obj,
                                                  jstring j_url,
                                                  jobject j_callback) {
@@ skipping 150 matching lines @@
       base::Time::Now());
   if (!new_node) {
     NOTREACHED();
     return ScopedJavaLocalRef<jobject>();
   }
   ScopedJavaLocalRef<jobject> new_java_obj = JavaBookmarkIdCreateBookmarkId(
       env, new_node->id(), BookmarkType::BOOKMARK_TYPE_NORMAL);
   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;
 
   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 jint GetDefaultViewMode(JNIEnv* env, jclass jcaller) {
   return enhanced_bookmarks::GetDefaultViewMode();
 }
 
 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