chrome/browser/policy/policy_prefs_browsertest.cc - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

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/policy/policy_prefs_browsertest.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 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:

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

Download patch

« no previous file with comments | « chrome/browser/policy/device_status_collector_browsertest.cc ('k') | chrome/browser/policy/policy_statistics_collector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/policy_prefs_browsertest.cc

diff --git a/chrome/browser/policy/policy_prefs_browsertest.cc b/chrome/browser/policy/policy_prefs_browsertest.cc

index 5d577f49d90f34d84e5966cf2b2251117efe73f9..b004e5156a24d6b681cdf62917946f14ae048ab5 100644

--- a/chrome/browser/policy/policy_prefs_browsertest.cc

+++ b/chrome/browser/policy/policy_prefs_browsertest.cc

@@ -430,8 +430,10 @@ IN_PROC_BROWSER_TEST_P(PolicyPrefsTest, PolicyToPrefsMapping) {

if (StartsWithASCII((*pref_mapping)->pref(), kCrosSettingsPrefix, true))

continue;

+ PrefService* local_state = g_browser_process->local_state();

+ PrefService* user_prefs = browser()->profile()->GetPrefs();

PrefService* prefs = (*pref_mapping)->is_local_state() ?

- g_browser_process->local_state() : browser()->profile()->GetPrefs();

+ local_state : user_prefs;

// The preference must have been registered.

const PrefService::Preference* pref =

prefs->FindPreference((*pref_mapping)->pref().c_str());

@@ -520,8 +522,10 @@ IN_PROC_BROWSER_TEST_P(PolicyPrefsTest, CheckPolicyIndicators) {

if (!policy_test_case->can_be_recommended())