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

chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc

 // Copyright 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 "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
@@ skipping 98 matching lines @@
   EXPECT_EQ(std::vector<GURL>(urls, urls + arraysize(urls)), startup_pref.urls);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, OverrideDSE) {
   PrefService* prefs = profile()->GetPrefs();
   ASSERT_TRUE(prefs);
   TemplateURLService* url_service =
       TemplateURLServiceFactory::GetForProfile(profile());
   ASSERT_TRUE(url_service);
   EXPECT_TRUE(VerifyTemplateURLServiceLoad(url_service));
-  TemplateURL* default_provider = url_service->GetDefaultSearchProvider();
+  const TemplateURL* default_provider = url_service->GetDefaultSearchProvider();
   ASSERT_TRUE(default_provider);
   EXPECT_EQ(TemplateURL::NORMAL, default_provider->type());
 
   const extensions::Extension* extension = LoadExtensionWithInstallParam(
       test_data_dir_.AppendASCII("settings_override"), kFlagEnableFileAccess,
       "10");
   ASSERT_TRUE(extension);
-  TemplateURL* current_dse = url_service->GetDefaultSearchProvider();
+  const TemplateURL* current_dse = url_service->GetDefaultSearchProvider();
   EXPECT_EQ(TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, current_dse->type());
 
   std::unique_ptr<TemplateURLData> extension_dse =
       TestExtensionSearchEngine(prefs);
   ExpectSimilar(extension_dse.get(), &current_dse->data());
 
   UnloadExtension(extension->id());
   EXPECT_EQ(default_provider, url_service->GetDefaultSearchProvider());
 }
 
 // Install and load extension into test profile.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PRE_OverridenDSEPersists) {
   PrefService* prefs = profile()->GetPrefs();
   ASSERT_TRUE(prefs);
   TemplateURLService* url_service =
       TemplateURLServiceFactory::GetForProfile(profile());
   ASSERT_TRUE(url_service);
   EXPECT_TRUE(VerifyTemplateURLServiceLoad(url_service));
-  TemplateURL* default_provider = url_service->GetDefaultSearchProvider();
+  const TemplateURL* default_provider = url_service->GetDefaultSearchProvider();
   ASSERT_TRUE(default_provider);
   // Check that default provider is normal before extension is
   // installed and loaded.
   EXPECT_EQ(TemplateURL::NORMAL, default_provider->type());
   EXPECT_NE(base::ASCIIToUTF16("name.de"), default_provider->short_name());
   EXPECT_NE(base::ASCIIToUTF16("keyword.de"), default_provider->keyword());
 
   // Install extension that overrides DSE.
   const extensions::Extension* extension = LoadExtensionWithInstallParam(
       test_data_dir_.AppendASCII("settings_override"), kFlagEnableFileAccess,
@@ skipping 29 matching lines @@
       UIThreadSearchTermsData(profile));
 
   EXPECT_EQ(new_tab_url_ext, search::GetNewTabPageURL(profile).spec());
 
   // Check that after template url service is loaded, extension dse persists.
   TemplateURLService* url_service =
       TemplateURLServiceFactory::GetForProfile(profile);
   ASSERT_TRUE(url_service);
   EXPECT_TRUE(VerifyTemplateURLServiceLoad(url_service));
   EXPECT_TRUE(url_service->IsExtensionControlledDefaultSearch());
-  TemplateURL* default_provider = url_service->GetDefaultSearchProvider();
+  const TemplateURL* default_provider = url_service->GetDefaultSearchProvider();
   ASSERT_TRUE(default_provider);
   ExpectSimilar(extension_dse.get(), &default_provider->data());
 }
 
 // This test checks that an extension overriding the default search engine can
 // be correctly loaded before the TemplateURLService is loaded.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, BeforeTemplateUrlServiceLoad) {
   PrefService* prefs = profile()->GetPrefs();
   ASSERT_TRUE(prefs);
   TemplateURLService* url_service =
       TemplateURLServiceFactory::GetForProfile(profile());
   ASSERT_TRUE(url_service);
 
   EXPECT_FALSE(url_service->IsExtensionControlledDefaultSearch());
   const extensions::Extension* extension = LoadExtensionWithInstallParam(
       test_data_dir_.AppendASCII("settings_override"), kFlagEnableFileAccess,
       "10");
   ASSERT_TRUE(extension);
-  TemplateURL* current_dse = url_service->GetDefaultSearchProvider();
+  const TemplateURL* current_dse = url_service->GetDefaultSearchProvider();
   EXPECT_EQ(TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, current_dse->type());
   EXPECT_TRUE(url_service->IsExtensionControlledDefaultSearch());
 
   std::unique_ptr<TemplateURLData> extension_dse =
       TestExtensionSearchEngine(prefs);
   ExpectSimilar(extension_dse.get(), &current_dse->data());
 
   UnloadExtension(extension->id());
   EXPECT_NE(TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION,
             url_service->GetDefaultSearchProvider()->type());
   EXPECT_FALSE(url_service->IsExtensionControlledDefaultSearch());
 }
 
 #else
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, SettingsOverridesDisallowed) {
   const extensions::Extension* extension =
       LoadExtensionWithFlags(test_data_dir_.AppendASCII("settings_override"),
                              kFlagIgnoreManifestWarnings);
   ASSERT_TRUE(extension);
   ASSERT_EQ(1u, extension->install_warnings().size());
   EXPECT_EQ(std::string("'chrome_settings_overrides' "
                         "is not allowed for specified platform."),
             extension->install_warnings().front().message);
 }
 #endif
 
 }  // namespace