Index: chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc |
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc |
index f79f6b67c9a4a42b3d44cea51d0fa66b049c43a3..4f0120aa72870fc296cc41b4f8f69d7c52077561 100644 |
--- a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc |
+++ b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc |
@@ -91,10 +91,11 @@ TEST_F(TemplateURLPrepopulateDataTest, UniqueIDs) { |
// Verifies that default search providers from the preferences file |
// override the built-in ones. |
TEST_F(TemplateURLPrepopulateDataTest, ProvidersFromPrefs) { |
- TestingPrefService prefs; |
- TemplateURLPrepopulateData::RegisterUserPrefs(&prefs); |
- prefs.SetUserPref(prefs::kSearchProviderOverridesVersion, |
- Value::CreateIntegerValue(1)); |
+ scoped_ptr<TestingPrefService> prefs( |
+ TestingPrefService::CreateTestingPrefService()); |
+ TemplateURLPrepopulateData::RegisterUserPrefs(prefs.get()); |
+ prefs->SetUserPref(prefs::kSearchProviderOverridesVersion, |
+ Value::CreateIntegerValue(1)); |
ListValue* overrides = new ListValue; |
DictionaryValue* entry = new DictionaryValue; |
entry->SetString("name", "foo"); |
@@ -108,15 +109,15 @@ TEST_F(TemplateURLPrepopulateDataTest, ProvidersFromPrefs) { |
entry->SetInteger("logo_id", 0); |
entry->SetInteger("id", 1001); |
overrides->Append(entry); |
- prefs.SetUserPref(prefs::kSearchProviderOverrides, overrides); |
+ prefs->SetUserPref(prefs::kSearchProviderOverrides, overrides); |
- int version = TemplateURLPrepopulateData::GetDataVersion(&prefs); |
+ int version = TemplateURLPrepopulateData::GetDataVersion(prefs.get()); |
EXPECT_EQ(1, version); |
ScopedVector<TemplateURL> t_urls; |
size_t default_index; |
TemplateURLPrepopulateData::GetPrepopulatedEngines( |
- &prefs, &(t_urls.get()), &default_index); |
+ prefs.get(), &(t_urls.get()), &default_index); |
ASSERT_EQ(1u, t_urls.size()); |
EXPECT_EQ(L"foo", t_urls[0]->short_name()); |