chrome/browser/chromeos/preferences_unittest.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying 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/chromeos/preferences_unittest.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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:

Index: chrome/browser/chromeos/preferences_unittest.cc

diff --git a/chrome/browser/chromeos/preferences_unittest.cc b/chrome/browser/chromeos/preferences_unittest.cc

index caece5e618c016e76724c6b546b55301bfafffd9..358782654087c3dc881416f0db98027af49ae0f8 100644

--- a/chrome/browser/chromeos/preferences_unittest.cc

+++ b/chrome/browser/chromeos/preferences_unittest.cc

@@ -55,8 +55,8 @@ class MyMockInputMethodManager : public input_method::MockInputMethodManager {

TEST(PreferencesTest, TestUpdatePrefOnBrowserScreenDetails) {

TestingPrefServiceSyncable prefs;

- Preferences::RegisterUserPrefs(&prefs);

- DownloadPrefs::RegisterUserPrefs(&prefs);

+ Preferences::RegisterUserPrefs(&prefs, prefs.registry());

+ DownloadPrefs::RegisterUserPrefs(&prefs, prefs.registry());

StringPrefMember previous;

previous.Init(prefs::kLanguagePreviousInputMethod, &prefs);