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 a5b5b391551767cc8d143bcd9ab182c4e37c27f7..ce0b77e5424afd0e9e803b1c919b5646dba74630 100644 |
--- a/chrome/browser/search_engines/template_url_service_android.cc |
+++ b/chrome/browser/search_engines/template_url_service_android.cc |
@@ -70,7 +70,7 @@ void TemplateUrlServiceAndroid::SetUserSelectedDefaultSearchProvider( |
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); |
@@ -111,7 +111,7 @@ jboolean TemplateUrlServiceAndroid::IsSearchByImageAvailable( |
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( |
@@ -158,7 +158,7 @@ void TemplateUrlServiceAndroid::LoadTemplateURLs() { |
}); |
// 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; }); |
@@ -238,7 +238,7 @@ TemplateUrlServiceAndroid::ReplaceSearchTermsInUrl( |
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)); |