[Android] Allow setting recently visited search engines as default search engine

chrome/browser/search_engines/template_url_service_android.cc

 // Copyright (c) 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/search_engines/template_url_service_android.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_string.h"
 #include "base/bind.h"
@@ skipping 39 matching lines @@
 }
 
 void TemplateUrlServiceAndroid::Load(JNIEnv* env,
                                      const JavaParamRef<jobject>& obj) {
   template_url_service_->Load();
 }
 
 void TemplateUrlServiceAndroid::SetUserSelectedDefaultSearchProvider(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
-    jint selected_index) {
-  std::vector<TemplateURL*> template_urls =
-      template_url_service_->GetTemplateURLs();
-  size_t selected_index_size_t = static_cast<size_t>(selected_index);
-  DCHECK_LT(selected_index_size_t, template_urls.size()) <<
-      "Wrong index for search engine";
+    const JavaParamRef<jstring>& jkeyword) {
+  base::string16 keyword(
+      base::android::ConvertJavaStringToUTF16(env, jkeyword));
+  TemplateURL* template_url =
+      template_url_service_->GetTemplateURLForKeyword(keyword);
+  template_url_service_->SetUserSelectedDefaultSearchProvider(template_url);
+}
 
-  TemplateURL* template_url = template_urls[selected_index_size_t];
-  template_url_service_->SetUserSelectedDefaultSearchProvider(template_url);
+bool TemplateUrlServiceAndroid::IsInDefaultList(TemplateURL* template_url) {
+  return IsPrepopulatedTemplate(template_url) ||
+         template_url->created_by_policy();
 }
 
 jint TemplateUrlServiceAndroid::GetDefaultSearchProvider(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
+  size_t index = -1;
+  template_url_list_.clear();
   std::vector<TemplateURL*> template_urls =
       template_url_service_->GetTemplateURLs();
   TemplateURL* default_search_provider =
       template_url_service_->GetDefaultSearchProvider();
+  std::vector<TemplateURL*> recent_visit_list;
   for (size_t i = 0; i < template_urls.size(); ++i) {
-    if (default_search_provider == template_urls[i])
-      return i;
+    if (IsInDefaultList(template_urls[i])) {
+      template_url_list_.push_back(template_urls[i]);
+      if (default_search_provider == template_urls[i])
+        index = template_url_list_.size() - 1;
+    } else if (default_search_provider == template_urls[i]) {

[Ian Wen, 2016/10/19 00:03:31]

I don't understand why you need to continue if dsp is current template url.

[ltian, 2016/10/19 18:56:32]

This part checks if the default search engine is a recently visited one. If so,
we want put it after all the prepopulated ones. For example Airbnb could be put
in front of all the prepopulated ones if set as default. So we manually change
the order of the list.

+      continue;
+    } else {
+      recent_visit_list.push_back(template_urls[i]);
+    }
   }
-  return -1;
+  // If default search engine is recently visited one, force it to

[Ian Wen, 2016/10/19 00:03:31]

Did you mean if index is not set, then dsp is in recent list?

If so, you should guard the following following code by checking if index == -1.

[ltian, 2016/10/19 18:56:31]

No, the index is set but not guaranteed to be after all prepopulated ones. So we
reorganize the order.

+  // append at the bottom of default list.
+  if (!IsInDefaultList(default_search_provider)) {
+    template_url_list_.push_back(default_search_provider);
+    index = template_url_list_.size() - 1;
+  }
+  for (size_t i = 0; i < recent_visit_list.size(); ++i)
+    template_url_list_.push_back(recent_visit_list[i]);
+  return index;
 }
 
 jboolean TemplateUrlServiceAndroid::IsLoaded(JNIEnv* env,
                                              const JavaParamRef<jobject>& obj) {
   return template_url_service_->loaded();
 }
 
 jint TemplateUrlServiceAndroid::GetTemplateUrlCount(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
-  return template_url_service_->GetTemplateURLs().size();
+  return template_url_list_.size();
 }
 
 jboolean TemplateUrlServiceAndroid::IsSearchProviderManaged(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   return template_url_service_->is_default_search_managed();
 }
 
 jboolean TemplateUrlServiceAndroid::IsSearchByImageAvailable(
     JNIEnv* env,
@@ skipping 13 matching lines @@
       template_url_service_->GetDefaultSearchProvider();
   return default_search_provider &&
       default_search_provider->url_ref().HasGoogleBaseURLs(
           template_url_service_->search_terms_data());
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 TemplateUrlServiceAndroid::GetTemplateUrlAt(JNIEnv* env,
                                             const JavaParamRef<jobject>& obj,
                                             jint index) {
-  TemplateURL* template_url = template_url_service_->GetTemplateURLs()[index];
+  TemplateURL* template_url = template_url_list_[index];
+  if (!template_url)
+    return NULL;
   return Java_TemplateUrl_create(
       env, index,
       base::android::ConvertUTF16ToJavaString(env, template_url->short_name()),
-      IsPrepopulatedTemplate(template_url) ||
-          template_url->created_by_policy());
+      base::android::ConvertUTF8ToJavaString(env, template_url->url()),
+      IsInDefaultList(template_url),
+      base::android::ConvertUTF16ToJavaString(env, template_url->keyword()));
 }
 
 bool TemplateUrlServiceAndroid::IsPrepopulatedTemplate(TemplateURL* url) {
   return url->prepopulate_id() > 0;
 }
 
 void TemplateUrlServiceAndroid::OnTemplateURLServiceLoaded() {
   template_url_subscription_.reset();
   JNIEnv* env = base::android::AttachCurrentThread();
   if (weak_java_obj_.get(env).is_null())
@@ skipping 110 matching lines @@
     url = gurl.spec();
   }
 
   return base::android::ConvertUTF8ToJavaString(env, url);
 }
 
 base::android::ScopedJavaLocalRef<jstring>
 TemplateUrlServiceAndroid::GetSearchEngineUrlFromTemplateUrl(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
-    jint index) {
-  TemplateURL* template_url = template_url_service_->GetTemplateURLs()[index];
+    const JavaParamRef<jstring>& jkeyword) {
+  base::string16 keyword(
+      base::android::ConvertJavaStringToUTF16(env, jkeyword));
+  TemplateURL* template_url =
+      template_url_service_->GetTemplateURLForKeyword(keyword);
   std::string url(template_url->url_ref().ReplaceSearchTerms(
       TemplateURLRef::SearchTermsArgs(base::ASCIIToUTF16("query")),
       template_url_service_->search_terms_data()));
   return base::android::ConvertUTF8ToJavaString(env, url);
 }
 
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   TemplateUrlServiceAndroid* template_url_service_android =
       new TemplateUrlServiceAndroid(env, obj);
   return reinterpret_cast<intptr_t>(template_url_service_android);
 }
 
 // static
 bool TemplateUrlServiceAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }