chrome/browser/policy/user_cloud_policy_manager_chromeos_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/policy/user_cloud_policy_manager_chromeos_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:

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

Download patch

Index: chrome/browser/policy/user_cloud_policy_manager_chromeos_unittest.cc

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

index 9794fae4f0c896a820ab42c9757878a79768208e..86fd7ed8ec941521e5991339cf502474ebb188b9 100644

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

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

@@ -35,7 +35,7 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test {

: store_(NULL) {}

virtual void SetUp() OVERRIDE {

- chrome::RegisterLocalState(prefs_.registry(), &prefs_);

+ chrome::RegisterLocalState(&prefs_, prefs_.registry());

// Set up a policy map for testing.

policy_map_.Set("key", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,

« no previous file with comments | « chrome/browser/policy/url_blacklist_manager.cc ('k') | chrome/browser/policy/user_policy_signin_service_factory.h » ('j') | no next file with comments »