Handle TemplateURLService load failure better, and make some test correctness fixes that will be ne…

chrome/browser/search_engines/default_search_pref_migration_unittest.cc

Index: chrome/browser/search_engines/default_search_pref_migration_unittest.cc
diff --git a/chrome/browser/search_engines/default_search_pref_migration_unittest.cc b/chrome/browser/search_engines/default_search_pref_migration_unittest.cc
index 5a1fa35032780a53cacbdcd2d47c35ab7efdf621..181367013f1504b66ae43d2402081e65e3ddfa6c 100644
--- a/chrome/browser/search_engines/default_search_pref_migration_unittest.cc
+++ b/chrome/browser/search_engines/default_search_pref_migration_unittest.cc
@@ -64,7 +64,7 @@ TEST_F(DefaultSearchPrefMigrationTest, MigrateUserSelectedValue) {
   scoped_ptr<TemplateURL> t_url(
       CreateKeyword("name1", "key1", "http://foo1/{searchTerms}"));
   // Store a value in the legacy location.
-  TemplateURLService::SaveDefaultSearchProviderToPrefs(
+  test_util()->model()->SaveDefaultSearchProviderToPrefs(
       t_url.get(), test_util()->profile()->GetPrefs());
 
   // Run the migration.
@@ -87,7 +87,7 @@ TEST_F(DefaultSearchPrefMigrationTest, ModernValuePresent) {
   scoped_ptr<TemplateURL> t_url2(
       CreateKeyword("name2", "key2", "http://foo2/{searchTerms}"));
   // Store a value in the legacy location.
-  TemplateURLService::SaveDefaultSearchProviderToPrefs(
+  test_util()->model()->SaveDefaultSearchProviderToPrefs(
       t_url.get(), test_util()->profile()->GetPrefs());
 
   // Store another value in the modern location.