chrome/browser/prefs/scoped_user_pref_update_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/prefs/scoped_user_pref_update_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/prefs/scoped_user_pref_update_unittest.cc

diff --git a/chrome/browser/prefs/scoped_user_pref_update_unittest.cc b/chrome/browser/prefs/scoped_user_pref_update_unittest.cc

index e248819dd22c8eb776fb288d7b05fa788291d248..fdb58a53e56391f30b96c8f26daeb8540a821016 100644

--- a/chrome/browser/prefs/scoped_user_pref_update_unittest.cc

+++ b/chrome/browser/prefs/scoped_user_pref_update_unittest.cc

@@ -4,6 +4,7 @@

#include "base/prefs/public/pref_change_registrar.h"

#include "chrome/browser/prefs/mock_pref_change_callback.h"

+#include "chrome/browser/prefs/pref_registry_syncable.h"

#include "chrome/browser/prefs/scoped_user_pref_update.h"

#include "chrome/test/base/testing_pref_service.h"

#include "testing/gmock/include/gmock/gmock.h"

@@ -19,8 +20,9 @@ class ScopedUserPrefUpdateTest : public testing::Test {

protected:

virtual void SetUp() {

- prefs_.RegisterDictionaryPref(kPref,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+ prefs_.registry()->RegisterDictionaryPref(

+ kPref,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

registrar_.Init(&prefs_);

registrar_.Add(kPref, observer_.GetCallback());

}