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

chrome/browser/search_engines/template_url_service_android.cc

Index: chrome/browser/search_engines/template_url_service_android.cc
diff --git a/chrome/browser/search_engines/template_url_service_android.cc b/chrome/browser/search_engines/template_url_service_android.cc
index 6563f7e0d9fe6723a26a201d775e14c8373f0bb8..36d37ca6b2dc5d1f48160fe6a18f9bd6ecea8fc2 100644
--- a/chrome/browser/search_engines/template_url_service_android.cc
+++ b/chrome/browser/search_engines/template_url_service_android.cc
@@ -57,29 +57,49 @@ void TemplateUrlServiceAndroid::Load(JNIEnv* env,
 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";
-
-  TemplateURL* template_url = template_urls[selected_index_size_t];
+    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);
 }
 
+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]);
+    }
+  }
+  // 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;
   }
-  return -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,
@@ -90,7 +110,7 @@ jboolean TemplateUrlServiceAndroid::IsLoaded(JNIEnv* env,
 jint TemplateUrlServiceAndroid::GetTemplateUrlCount(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
-  return template_url_service_->GetTemplateURLs().size();
+  return template_url_list_.size();
 }
 
 jboolean TemplateUrlServiceAndroid::IsSearchProviderManaged(
@@ -124,12 +144,15 @@ 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) {
@@ -260,8 +283,11 @@ 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()));