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

 // 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 "chrome/browser/search_engines/default_search_pref_migration.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ skipping 46 matching lines @@
   data.SetKeyword(base::ASCIIToUTF16(keyword));
   data.SetURL(url);
   scoped_ptr<TemplateURL> t_url(new TemplateURL(test_util_.profile(), data));
   return t_url.Pass();
 }
 
 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.
   ConfigureDefaultSearchPrefMigrationToDictionaryValue(
       test_util()->profile()->GetPrefs());
 
   // Test that it was migrated.
   DefaultSearchManager manager(test_util()->profile()->GetPrefs(),
                                DefaultSearchManager::ObserverCallback());
   TemplateURLData* modern_default = manager.GetDefaultSearchEngine(NULL);
   ASSERT_TRUE(modern_default);
   EXPECT_EQ(t_url->short_name(), modern_default->short_name);
   EXPECT_EQ(t_url->keyword(), modern_default->keyword());
   EXPECT_EQ(t_url->url(), modern_default->url());
 }
 
 TEST_F(DefaultSearchPrefMigrationTest, ModernValuePresent) {
   scoped_ptr<TemplateURL> t_url(
       CreateKeyword("name1", "key1", "http://foo1/{searchTerms}"));
   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.
   DefaultSearchManager(test_util()->profile()->GetPrefs(),
                        DefaultSearchManager::ObserverCallback())
       .SetUserSelectedDefaultSearchEngine(t_url2->data());
 
   // Run the migration.
   ConfigureDefaultSearchPrefMigrationToDictionaryValue(
       test_util()->profile()->GetPrefs());
@@ skipping 70 matching lines @@
   // TODO(caitkp/erikwright): Look into loading policy values in tests. In
   // practice, the DefaultSearchEngineSource() would be FROM_POLICY in this
   // case, but since we are not loading the policy here, it will be
   // FROM_FALLBACK instead.
   // Test that the policy-defined value is not migrated.
   ASSERT_EQ(DefaultSearchManager::FROM_FALLBACK,
             DefaultSearchManager(test_util()->profile()->GetPrefs(),
                                  DefaultSearchManager::ObserverCallback())
                 .GetDefaultSearchEngineSource());
 }