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

components/search_engines/template_url_service.cc

 // Copyright 2014 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 "components/search_engines/template_url_service.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 586 matching lines @@
   } else {
     // We rely on the DefaultSearchManager to call OnDefaultSearchChange if, in
     // fact, the effective DSE changes.
     if (url)
       default_search_manager_.SetUserSelectedDefaultSearchEngine(url->data());
     else
       default_search_manager_.ClearUserSelectedDefaultSearchEngine();
   }
 }
 
-TemplateURL* TemplateURLService::GetDefaultSearchProvider() {
-  return const_cast<TemplateURL*>(
-      static_cast<const TemplateURLService*>(this)->GetDefaultSearchProvider());
-}
-
 const TemplateURL* TemplateURLService::GetDefaultSearchProvider() const {
   return loaded_ ? default_search_provider_
                  : initial_default_search_provider_.get();
 }
 
 bool TemplateURLService::IsSearchResultsPageFromDefaultSearchProvider(
     const GURL& url) const {
   const TemplateURL* default_provider = GetDefaultSearchProvider();
   return default_provider &&
       default_provider->IsSearchURL(url, search_terms_data());
@@ skipping 1868 matching lines @@
     if (!IsCreatedByExtension(template_url.get())) {
       if (keyword_to_template_url.find(template_url->keyword()) !=
           keyword_to_template_url.end()) {
         return true;
       }
       keyword_to_template_url[template_url->keyword()] = template_url.get();
     }
   }
   return false;
 }