chrome/browser/search_engines/default_search_pref_migration_unittest.cc - Issue 263823007: Handle TemplateURLService load failure better

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/search_engines/default_search_pref_migration_unittest.cc

Issue 263823007: Handle TemplateURLService load failure better (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/search/instant_unittest_base.cc ('k') | chrome/browser/search_engines/template_url_service.h » ('j') | chrome/browser/search_engines/template_url_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 9d85c0e2d492d8b937f22ec144c9fda2be3384ff..8e1cf016dbad7c2abf3a7922c3fc850b1a235d99 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.

@@ -86,7 +86,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.