chrome/test/base/testing_browser_process.cc - Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

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/test/base/testing_browser_process.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments. Fix Clang build and fix bug shown by trybots. Created 7 years, 11 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/web_resource/promo_resource_service.cc ('K') | « chrome/test/base/testing_browser_process.h ('k') | chrome/test/base/testing_pref_service.h » ('j') | chrome/test/base/testing_pref_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/base/testing_browser_process.cc

diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc

index b955d4b3e77817d9897794843684fe2189da3fef..7c97e93d485a737eca18bcc9644b6acd4bef7377 100644

--- a/chrome/test/base/testing_browser_process.cc

+++ b/chrome/test/base/testing_browser_process.cc

@@ -96,7 +96,7 @@ void TestingBrowserProcess::SetProfileManager(ProfileManager* profile_manager) {

#endif

}

-PrefServiceSimple* TestingBrowserProcess::local_state() {

+PrefService* TestingBrowserProcess::local_state() {

return local_state_;

}

@@ -344,7 +344,7 @@ void TestingBrowserProcess::SetSystemRequestContext(

system_request_context_ = context_getter;

}

-void TestingBrowserProcess::SetLocalState(PrefServiceSimple* local_state) {

+void TestingBrowserProcess::SetLocalState(PrefService* local_state) {

if (!local_state) {

// The local_state_ PrefService is owned outside of TestingBrowserProcess,

// but some of the members of TestingBrowserProcess hold references to it