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

chrome/browser/search_engines/template_url_service_unittest.cc

 // Copyright (c) 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 "components/search_engines/template_url_service.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 938 matching lines @@
   test_util()->VerifyLoad();
 
   // The synced DSE GUID should be empty until the user selects something or
   // there is sync activity.
   EXPECT_TRUE(test_util()
                   ->profile()
                   ->GetTestingPrefService()
                   ->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.
   TemplateURL* user_dse = AddKeywordWithDate(
       "user_dse", "user_dse.com", "http://www.user_dse.com/s?q={searchTerms}",
       std::string(), std::string(), std::string(), true);
   model()->SetUserSelectedDefaultSearchProvider(user_dse);
   EXPECT_EQ(user_dse, model()->GetDefaultSearchProvider());
   // Check that user dse is different from initial.
   EXPECT_NE(initial_dse, user_dse);
@@ skipping 71 matching lines @@
 
   // The synced DSE GUID should be empty until the user selects something or
   // there is sync activity.
   EXPECT_TRUE(test_util()
                   ->profile()
                   ->GetTestingPrefService()
                   ->GetString(prefs::kSyncedDefaultSearchProviderGUID)
                   .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.
   TemplateURL* user_dse = model()->Add(
       base::MakeUnique<TemplateURL>(*GenerateDummyTemplateURLData("user_dse")));
   model()->SetUserSelectedDefaultSearchProvider(user_dse);
   EXPECT_EQ(user_dse, model()->GetDefaultSearchProvider());
 
   // Check that user DSE guid is stored in kSyncedDefaultSearchProviderGUID.
   EXPECT_EQ(user_dse->sync_guid(),
@@ skipping 259 matching lines @@
   ASSERT_TRUE(
       model()->GetTemplateURLForKeyword(ASCIIToUTF16("unittest")) != NULL);
 }
 
 // Make sure that load routine doesn't delete
 // prepopulated engines that no longer exist in the prepopulate data if
 // it has been modified by the user.
 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()));
 
   // Wait for any saves to finish.
   base::RunLoop().RunUntilIdle();
 
   // Reload the model and check that the default search provider
   // was properly saved.
   test_util()->ResetModel(true);
@@ skipping 51 matching lines @@
 // missing and not managed.
 TEST_F(TemplateURLServiceTest, LoadEnsuresDefaultSearchProviderExists) {
   // Force the model to load and make sure we have a default search provider.
   test_util()->VerifyLoad();
   EXPECT_TRUE(model()->GetDefaultSearchProvider());
 
   EXPECT_TRUE(model()->GetDefaultSearchProvider()->SupportsReplacement(
       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();
 
   // Reset the model and load it. There should be a usable default search
   // provider.
   test_util()->ResetModel(true);
 
   ASSERT_TRUE(model()->GetDefaultSearchProvider());
   EXPECT_TRUE(model()->GetDefaultSearchProvider()->SupportsReplacement(
@@ skipping 543 matching lines @@
   DCHECK(search_engine2);
 
   base::HistogramTester histogram_tester;
   model()->SetUserSelectedDefaultSearchProvider(search_engine1);
   histogram_tester.ExpectTotalCount("Search.DefaultSearchChangeOrigin", 1);
   model()->SetUserSelectedDefaultSearchProvider(search_engine1);
   histogram_tester.ExpectTotalCount("Search.DefaultSearchChangeOrigin", 1);
   model()->SetUserSelectedDefaultSearchProvider(search_engine2);
   histogram_tester.ExpectTotalCount("Search.DefaultSearchChangeOrigin", 2);
 }