chrome/browser/search_engines/template_url_model_test_util.cc - Issue 5646003: Sanitize PrefStore interface.

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_model_test_util.cc

Issue 5646003: Sanitize PrefStore interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix PrefService mock construction in PrefServiceTest to include command line store. Created 10 years ago

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

Jump to:

Index: chrome/browser/search_engines/template_url_model_test_util.cc

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

index 52a6c91be27d15b6722bfbf9ab5a47543a73506b..e6ebc8d86fb7d5b7e3e48900d7b41edbd942cc8c 100644

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

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

@@ -167,9 +167,8 @@ void TemplateURLModelTestUtil::OnTemplateURLModelChanged() {

changed_count_++;

}

-void TemplateURLModelTestUtil::VerifyObserverCount(int expected_changed_count) {

- ASSERT_EQ(expected_changed_count, changed_count_);

- changed_count_ = 0;

+int TemplateURLModelTestUtil::GetObserverCount() {

+ return changed_count_;

}

void TemplateURLModelTestUtil::ResetObserverCount() {

@@ -188,7 +187,8 @@ void TemplateURLModelTestUtil::VerifyLoad() {

ASSERT_FALSE(model()->loaded());

model()->Load();

BlockTillServiceProcessesRequests();

- VerifyObserverCount(1);

+ EXPECT_EQ(1, GetObserverCount());

+ ResetObserverCount();

}

void TemplateURLModelTestUtil::ChangeModelToLoadState() {