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

chrome/browser/search/search.cc

 // Copyright 2012 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/search.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 67 matching lines @@
   // URL should not be used because it is blocked for a supervised user.
   NEW_TAB_URL_BLOCKED = 6,
 
   NEW_TAB_URL_MAX
 };
 
 base::Feature kUseGoogleLocalNtp {
   "UseGoogleLocalNtp", base::FEATURE_DISABLED_BY_DEFAULT
 };
 
-TemplateURL* GetDefaultSearchProviderTemplateURL(Profile* profile) {
+const TemplateURL* GetDefaultSearchProviderTemplateURL(Profile* profile) {
   if (profile) {
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(profile);
     if (template_url_service)
       return template_url_service->GetDefaultSearchProvider();
   }
   return NULL;
 }
 
 bool DefaultSearchProviderIsGoogle(Profile* profile) {
@@ skipping 35 matching lines @@
   if (!IsInstantExtendedAPIEnabled())
     return false;
 
   if (!url.is_valid())
     return false;
 
   const GURL new_tab_url(GetNewTabPageURL(profile));
   if (new_tab_url.is_valid() && MatchesOriginAndPath(url, new_tab_url))
     return true;
 
-  TemplateURL* template_url = GetDefaultSearchProviderTemplateURL(profile);
+  const TemplateURL* template_url =
+      GetDefaultSearchProviderTemplateURL(profile);
   if (!template_url)
     return false;
 
   if (!IsSuitableURLForInstant(url, template_url))
     return false;
 
   const TemplateURLRef& instant_url_ref = template_url->instant_url_ref();
   UIThreadSearchTermsData search_terms_data(profile);
   const GURL instant_url = TemplateURLRefToGURL(
       instant_url_ref, search_terms_data, false, false);
@@ skipping 56 matching lines @@
   NewTabURLDetails(const GURL& url, NewTabURLState state)
       : url(url), state(state) {}
 
   static NewTabURLDetails ForProfile(Profile* profile) {
     const GURL local_url(chrome::kChromeSearchLocalNtpUrl);
 
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
     if (command_line->HasSwitch(switches::kForceLocalNtp))
       return NewTabURLDetails(local_url, NEW_TAB_URL_VALID);
 
-    TemplateURL* template_url = GetDefaultSearchProviderTemplateURL(profile);
+    const TemplateURL* template_url =
+        GetDefaultSearchProviderTemplateURL(profile);
     if (!profile || !template_url)
       return NewTabURLDetails(local_url, NEW_TAB_URL_BAD);
 
     GURL search_provider_url = TemplateURLRefToGURL(
         template_url->new_tab_url_ref(), UIThreadSearchTermsData(profile),
         false, false);
 
     if (ShouldShowLocalNewTab(search_provider_url, profile))
       return NewTabURLDetails(local_url, NEW_TAB_URL_VALID);
 
@@ skipping 22 matching lines @@
     // InstantSearchPrerenderer has the search query for the Instant search base
     // page.
     InstantSearchPrerenderer* prerenderer =
         InstantSearchPrerenderer::GetForProfile(profile);
     // TODO(kmadhusu): Remove this CHECK after the investigation of
     // crbug.com/367204.
     CHECK(prerenderer);
     return prerenderer->get_last_query();
   }
 
-  TemplateURL* template_url = GetDefaultSearchProviderTemplateURL(profile);
+  const TemplateURL* template_url =
+      GetDefaultSearchProviderTemplateURL(profile);
   base::string16 search_terms;
   if (template_url)
     template_url->ExtractSearchTermsFromURL(
         url, UIThreadSearchTermsData(profile), &search_terms);
   return search_terms;
 }
 
 bool ShouldAssignURLToInstantRenderer(const GURL& url, Profile* profile) {
   return url.is_valid() &&
          profile &&
@@ skipping 68 matching lines @@
 
 bool IsSuggestPrefEnabled(Profile* profile) {
   return profile && !profile->IsOffTheRecord() && profile->GetPrefs() &&
          profile->GetPrefs()->GetBoolean(prefs::kSearchSuggestEnabled);
 }
 
 GURL GetInstantURL(Profile* profile, bool force_instant_results) {
   if (!IsInstantExtendedAPIEnabled() || !IsSuggestPrefEnabled(profile))
     return GURL();
 
-  TemplateURL* template_url = GetDefaultSearchProviderTemplateURL(profile);
+  const TemplateURL* template_url =
+      GetDefaultSearchProviderTemplateURL(profile);
   if (!template_url)
     return GURL();
 
   GURL instant_url = TemplateURLRefToGURL(
       template_url->instant_url_ref(), UIThreadSearchTermsData(profile),
       true, force_instant_results);
   if (!instant_url.is_valid() ||
       !template_url->HasSearchTermsReplacementKey(instant_url))
     return GURL();
 
   // Extended mode requires HTTPS.  Force it unless the base URL was overridden
   // on the command line, in which case we allow HTTP (see comments on
   // IsSuitableURLForInstant()).
   if (!instant_url.SchemeIsCryptographic() &&
       !google_util::StartsWithCommandLineGoogleBaseURL(instant_url)) {
     GURL::Replacements replacements;
     replacements.SetSchemeStr(url::kHttpsScheme);
     instant_url = instant_url.ReplaceComponents(replacements);
   }
 
   if (!IsURLAllowedForSupervisedUser(instant_url, profile))
     return GURL();
 
   return instant_url;
 }
 
 // Returns URLs associated with the default search engine for |profile|.
 std::vector<GURL> GetSearchURLs(Profile* profile) {
   std::vector<GURL> result;
-  TemplateURL* template_url = GetDefaultSearchProviderTemplateURL(profile);
+  const TemplateURL* template_url =
+      GetDefaultSearchProviderTemplateURL(profile);
   if (!template_url)
     return result;
   for (const TemplateURLRef& ref : template_url->url_refs()) {
     result.push_back(TemplateURLRefToGURL(ref, UIThreadSearchTermsData(profile),
                                           false, false));
   }
   return result;
 }
 
 GURL GetNewTabPageURL(Profile* profile) {
@@ skipping 64 matching lines @@
 
   if (IsInstantNTPURL(*url, profile)) {
     *url = GURL(chrome::kChromeUINewTabURL);
     return true;
   }
 
   return false;
 }
 
 }  // namespace search