chrome/browser/search/instant_unittest_base.cc - Issue 268643002: Use the DefaultSearchManager as the exclusive authority on DSE, ignoring Web Data.

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

Issue 268643002: Use the DefaultSearchManager as the exclusive authority on DSE, ignoring Web Data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix the KeywordEditorControllerTest. Created 6 years, 8 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

« chrome/browser/search/instant_unittest_base.h ('K') | « chrome/browser/search/instant_unittest_base.h ('k') | chrome/browser/search_engines/default_search_manager.h » ('j') | chrome/browser/search_engines/default_search_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search/instant_unittest_base.cc

diff --git a/chrome/browser/search/instant_unittest_base.cc b/chrome/browser/search/instant_unittest_base.cc

index 629100934369a6e92fcf3a105e03a90b32ed1a68..c67dede1ba953c26647422bc026423aca01c22f2 100644

--- a/chrome/browser/search/instant_unittest_base.cc

+++ b/chrome/browser/search/instant_unittest_base.cc

@@ -87,11 +87,14 @@ bool InstantUnitTestBase::IsInstantServiceObserver(

return instant_service_->observers_.HasObserver(observer);

}

+void InstantUnitTestBase::CustomizeServiceFactories() {

+ TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(

+ profile(), &TemplateURLServiceFactory::BuildInstanceFor);

void InstantUnitTestBase::SetUpHelper() {

BrowserWithTestWindowTest::SetUp();

- TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(

- profile(), &TemplateURLServiceFactory::BuildInstanceFor);

template_url_service_ = TemplateURLServiceFactory::GetForProfile(profile());

ui_test_utils::WaitForTemplateURLServiceToLoad(template_url_service_);