Remove non-const version of GetDefaultSearchProvider() and make all callers call the const version

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 52 matching lines @@
   base::string16 keyword(
       base::android::ConvertJavaStringToUTF16(env, jkeyword));
   TemplateURL* template_url =
       template_url_service_->GetTemplateURLForKeyword(keyword);
   template_url_service_->SetUserSelectedDefaultSearchProvider(template_url);
 }
 
 jint TemplateUrlServiceAndroid::GetDefaultSearchProviderIndex(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& obj) const {
-  TemplateURL* default_search_provider =
+  const TemplateURL* default_search_provider =
       template_url_service_->GetDefaultSearchProvider();
   auto it = std::find(template_urls_.begin(), template_urls_.end(),
                       default_search_provider);
   size_t default_search_provider_index_ =
       (it == template_urls_.end()) ? -1 : (it - template_urls_.begin());
   return default_search_provider_index_;
 }
 
 jboolean TemplateUrlServiceAndroid::IsLoaded(
     JNIEnv* env,
@@ skipping 20 matching lines @@
       template_url_service_->GetDefaultSearchProvider();
   return default_search_provider &&
       !default_search_provider->image_url().empty() &&
       default_search_provider->image_url_ref().IsValid(
           template_url_service_->search_terms_data());
 }
 
 jboolean TemplateUrlServiceAndroid::IsDefaultSearchEngineGoogle(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
-  TemplateURL* default_search_provider =
+  const TemplateURL* default_search_provider =
       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) const {
@@ skipping 26 matching lines @@
       template_urls_.begin(), template_urls_.end(),
       [template_url_service](const TemplateURL* t_url) {
         return template_url_service->IsPrepopulatedOrCreatedByPolicy(t_url);
       });
   std::sort(template_urls_.begin(), it,
             [](const TemplateURL* lhs, const TemplateURL* rhs) {
               return lhs->prepopulate_id() < rhs->prepopulate_id();
             });
 
   // Place any user-selected default engine next.
-  TemplateURL* dsp = template_url_service_->GetDefaultSearchProvider();
+  const TemplateURL* dsp = template_url_service_->GetDefaultSearchProvider();
   it = std::partition(it, template_urls_.end(),
                       [dsp](const TemplateURL* t_url) { return t_url == dsp; });
 
   // Sort the remaining engines to place the three most recently-visited first.
   constexpr size_t kMaxRecentUrls = 3;
   const size_t recent_url_num = template_urls_.end() - it;
   auto end = it + std::min(recent_url_num, kMaxRecentUrls);
   std::partial_sort(it, end, template_urls_.end(),
                     [](const TemplateURL* lhs, const TemplateURL* rhs) {
                       return lhs->last_visited() > rhs->last_visited();
@@ skipping 59 matching lines @@
 
   return base::android::ConvertUTF8ToJavaString(env, url);
 }
 
 base::android::ScopedJavaLocalRef<jstring>
 TemplateUrlServiceAndroid::ReplaceSearchTermsInUrl(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& jquery,
     const JavaParamRef<jstring>& jcurrent_url) {
-  TemplateURL* default_provider =
+  const TemplateURL* default_provider =
       template_url_service_->GetDefaultSearchProvider();
 
   base::string16 query(base::android::ConvertJavaStringToUTF16(env, jquery));
   GURL current_url(base::android::ConvertJavaStringToUTF16(env, jcurrent_url));
   GURL destination_url(current_url);
   if (default_provider && !query.empty()) {
     bool refined_query = default_provider->ReplaceSearchTermsInURL(
         current_url, TemplateURLRef::SearchTermsArgs(query),
         template_url_service_->search_terms_data(), &destination_url);
     if (refined_query)
@@ skipping 99 matching lines @@
 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);
 }