chrome/browser/search_engines/template_url_service_sync_unittest.cc - Issue 340553005: Stop depending on TemplateURLService from DefaultSearchManager

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/template_url_service_sync_unittest.cc

Issue 340553005: Stop depending on TemplateURLService from DefaultSearchManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments Created 6 years, 6 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_engines/template_url_service.cc ('k') | chrome/browser/search_engines/template_url_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/template_url_service_sync_unittest.cc

diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc

index 9070c50e711a7e9f53eb8e617762795a01c1be17..4ccbd86a80f740fef6ee832fdabb0a83032fe985 100644

--- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc

+++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc

@@ -228,7 +228,7 @@ TemplateURLServiceSyncTest::TemplateURLServiceSyncTest()

sync_processor_.get())) {}

void TemplateURLServiceSyncTest::SetUp() {

- TemplateURLService::set_fallback_search_engines_disabled(true);

+ DefaultSearchManager::SetFallbackSearchEnginesDisabledForTesting(true);

test_util_a_.SetUp();

// Use ChangeToLoadState() instead of VerifyLoad() so we don't actually pull

// in the prepopulate data, which the sync tests don't care about (and would

@@ -243,7 +243,7 @@ void TemplateURLServiceSyncTest::SetUp() {

void TemplateURLServiceSyncTest::TearDown() {

test_util_a_.TearDown();

- TemplateURLService::set_fallback_search_engines_disabled(false);

+ DefaultSearchManager::SetFallbackSearchEnginesDisabledForTesting(false);

}

scoped_ptr<syncer::SyncChangeProcessor>