chrome/browser/content_settings/content_settings_pref_provider_unittest.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/content_settings/content_settings_pref_provider_unittest.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/content_settings/content_settings_pref_provider.cc ('k') | chrome/browser/content_settings/cookie_settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

index 6b92b21841b08ec3696fcd695c6d593c30f7bcc8..eced8327cf369fbfe5180e9858bd37de58f14a05 100644

--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

@@ -133,12 +133,14 @@ TEST_F(PrefProviderTest, Incognito) {

new OverlayUserPrefStore(user_prefs);

PrefServiceMockBuilder builder;

- PrefService* regular_prefs = builder.WithUserPrefs(user_prefs).Create();

+ builder.WithUserPrefs(user_prefs);

+ PrefServiceSyncable* regular_prefs = builder.CreateSyncable();

Profile::RegisterUserPrefs(regular_prefs);

chrome::RegisterUserPrefs(regular_prefs);

- PrefService* otr_prefs = builder.WithUserPrefs(otr_user_prefs).Create();

+ builder.WithUserPrefs(otr_user_prefs);

+ PrefServiceSyncable* otr_prefs = builder.CreateSyncable();

Profile::RegisterUserPrefs(otr_prefs);

chrome::RegisterUserPrefs(otr_prefs);

@@ -331,7 +333,7 @@ TEST_F(PrefProviderTest, ResourceIdentifier) {

TEST_F(PrefProviderTest, AutoSubmitCertificateContentSetting) {

TestingProfile profile;

- TestingPrefService* prefs = profile.GetTestingPrefService();

+ TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();

GURL primary_url("https://www.example.com");

GURL secondary_url("https://www.sample.com");

@@ -365,7 +367,7 @@ TEST_F(PrefProviderTest, AutoSubmitCertificateContentSetting) {

// http://crosbug.com/17760

TEST_F(PrefProviderTest, Deadlock) {

- TestingPrefService prefs;

+ TestingPrefServiceSyncable prefs;

PrefProvider::RegisterUserPrefs(&prefs);

// Chain of events: a preference changes, |PrefProvider| notices it, and reads