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

chrome/browser/search_engines/template_url_service_unittest.cc

Index: chrome/browser/search_engines/template_url_service_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc
index 9ec307fc0510367687fe267ac12591fe665dadae..87da4e70ff9b92343725b373456ef03ddfcd21db 100644
--- a/chrome/browser/search_engines/template_url_service_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_unittest.cc
@@ -956,7 +956,7 @@ TEST_F(TemplateURLServiceTest, RepairPrepopulatedEnginesUpdatesSyncGuid) {
                   ->GetString(prefs::kSyncedDefaultSearchProviderGUID)
                   .empty());
 
-  TemplateURL* initial_dse = model()->GetDefaultSearchProvider();
+  const TemplateURL* initial_dse = model()->GetDefaultSearchProvider();
   ASSERT_TRUE(initial_dse);
 
   // Add user provided default search engine.
@@ -1048,7 +1048,7 @@ TEST_F(TemplateURLServiceTest,
                   .empty());
 
   // Get initial DSE to check its guid later.
-  TemplateURL* initial_dse = model()->GetDefaultSearchProvider();
+  const TemplateURL* initial_dse = model()->GetDefaultSearchProvider();
   ASSERT_TRUE(initial_dse);
 
   // Add user provided default search engine.
@@ -1328,7 +1328,7 @@ TEST_F(TemplateURLServiceTest, LoadRetainsModifiedProvider) {
 TEST_F(TemplateURLServiceTest, LoadSavesPrepopulatedDefaultSearchProvider) {
   test_util()->VerifyLoad();
   // Verify that the default search provider is set to something.
-  TemplateURL* default_search = model()->GetDefaultSearchProvider();
+  const TemplateURL* default_search = model()->GetDefaultSearchProvider();
   ASSERT_TRUE(default_search != NULL);
   std::unique_ptr<TemplateURL> cloned_url(
       new TemplateURL(default_search->data()));
@@ -1400,7 +1400,9 @@ TEST_F(TemplateURLServiceTest, LoadEnsuresDefaultSearchProviderExists) {
       search_terms_data()));
 
   // Make default search provider unusable (no search terms).
-  model()->ResetTemplateURL(model()->GetDefaultSearchProvider(),
+  TemplateURL* default_search_provider =
+      const_cast<TemplateURL*>(model()->GetDefaultSearchProvider());

[Peter Kasting, 2017/04/18 02:07:32]

Avoid this cast... for example:

  // Force the model to load and make sure we have a default search provider.
  test_util()->VerifyLoad();
  const TemplateURL* default_search = model()->GetDefaultSearchProvider();
  EXPECT_TRUE(default_search);
  EXPECT_TRUE(default_search->SupportsReplacement(search_terms_data()));

  // Make default search provider unusable (no search terms).  Using
  // GetTemplateURLForKeyword() gets a non-const pointer.
  model()->ResetTemplateURL(
      model()->GetTemplateURLForKeyword(default_search->keyword()),
      ASCIIToUTF16("test"), ASCIIToUTF16("test"), "http://example.com/");

[jeffschiller, 2017/04/21 04:58:35]

Done.

[jeffschiller, 2017/04/21 04:58:35]

Done.

+  model()->ResetTemplateURL(default_search_provider,
                             ASCIIToUTF16("test"), ASCIIToUTF16("test"),
                             "http://example.com/");
   base::RunLoop().RunUntilIdle();