Make several methods of TemplateUrlService const

components/search_engines/template_url_service.cc

Index: components/search_engines/template_url_service.cc
diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
index ca6401082f4f5c12ba4f65d6e200f92f2f448f07..5011707dfb225bbea6de2a7550e8fc5a634600a6 100644
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -343,7 +343,7 @@ base::string16 TemplateURLService::CleanUserInputKeyword(
 bool TemplateURLService::CanAddAutogeneratedKeyword(
     const base::string16& keyword,
     const GURL& url,
-    TemplateURL** template_url_to_replace) {
+    TemplateURL** template_url_to_replace) const {
   DCHECK(!keyword.empty());  // This should only be called for non-empty
                              // keywords. If we need to support empty kewords
                              // the code needs to change slightly.
@@ -367,12 +367,12 @@ bool TemplateURLService::CanAddAutogeneratedKeyword(
 }
 
 bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
-    const TemplateURL* t_url) {
+    const TemplateURL* t_url) const {
   return (t_url->prepopulate_id() > 0 || t_url->created_by_policy()) &&
       t_url->SupportsReplacement(search_terms_data());
 }
 
-bool TemplateURLService::ShowInDefaultList(const TemplateURL* t_url) {
+bool TemplateURLService::ShowInDefaultList(const TemplateURL* t_url) const {
   return t_url == default_search_provider_ ||
       IsPrepopulatedOrCreatedByPolicy(t_url);
 }
@@ -570,7 +570,7 @@ void TemplateURLService::ResetTemplateURL(TemplateURL* url,
     NotifyObservers();
 }
 
-bool TemplateURLService::CanMakeDefault(const TemplateURL* url) {
+bool TemplateURLService::CanMakeDefault(const TemplateURL* url) const {
   return
       ((default_search_provider_source_ == DefaultSearchManager::FROM_USER) ||
        (default_search_provider_source_ ==
@@ -621,7 +621,7 @@ bool TemplateURLService::IsSearchResultsPageFromDefaultSearchProvider(
       default_provider->IsSearchURL(url, search_terms_data());
 }
 
-bool TemplateURLService::IsExtensionControlledDefaultSearch() {
+bool TemplateURLService::IsExtensionControlledDefaultSearch() const {
   return default_search_provider_source_ ==
       DefaultSearchManager::FROM_EXTENSION;
 }
@@ -850,7 +850,7 @@ void TemplateURLService::OnWebDataServiceRequestDone(
 
 base::string16 TemplateURLService::GetKeywordShortName(
     const base::string16& keyword,
-    bool* is_omnibox_api_extension_keyword) {
+    bool* is_omnibox_api_extension_keyword) const {
   const TemplateURL* template_url = GetTemplateURLForKeyword(keyword);
 
   // TODO(sky): Once LocationBarView adds a listener to the TemplateURLService
@@ -1435,8 +1435,9 @@ void TemplateURLService::Init(const Initializer* initializers,
   RequestGoogleURLTrackerServerCheckIfNecessary();
 }
 
-TemplateURL* TemplateURLService::BestEngineForKeyword(TemplateURL* engine1,
-                                                      TemplateURL* engine2) {
+TemplateURL* TemplateURLService::BestEngineForKeyword(
+    TemplateURL* engine1,
+    TemplateURL* engine2) {

[Peter Kasting, 2017/04/13 06:15:35]

Similarly, can probably revert this

   DCHECK(engine1);
   DCHECK(engine2);
   DCHECK_EQ(engine1->keyword(), engine2->keyword());
@@ -1626,7 +1627,7 @@ void TemplateURLService::ChangeToLoadedState() {
 }
 
 bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
-    const std::string& host) {
+    const std::string& host) const {
   const TemplateURLSet* urls = provider_map_->GetURLsForHost(host);
   if (!urls)
     return true;
@@ -1637,7 +1638,7 @@ bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
   return true;
 }
 
-bool TemplateURLService::CanReplace(const TemplateURL* t_url) {
+bool TemplateURLService::CanReplace(const TemplateURL* t_url) const {
   return !ShowInDefaultList(t_url) && t_url->safe_for_autoreplace();
 }
 
@@ -2227,9 +2228,10 @@ base::string16 TemplateURLService::UniquifyKeyword(const TemplateURL& turl,
   return keyword_candidate;
 }
 
-bool TemplateURLService::IsLocalTemplateURLBetter(const TemplateURL* local_turl,
-                                                  const TemplateURL* sync_turl,
-                                                  bool prefer_local_default) {
+bool TemplateURLService::IsLocalTemplateURLBetter(
+    const TemplateURL* local_turl,
+    const TemplateURL* sync_turl,
+    bool prefer_local_default) const {
   DCHECK(GetTemplateURLForGUID(local_turl->sync_guid()));
   return local_turl->last_modified() > sync_turl->last_modified() ||
          local_turl->created_by_policy() ||