chrome/browser/policy/user_policy_signin_service_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_policy_signin_service_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/policy/user_policy_signin_service_unittest.cc

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

index 821de544cfd9dba33329db46cbc0d09ab150e8cf..7e40dd29415a1b17b4d50282efcdcd84514ffed0 100644

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

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

@@ -91,7 +91,7 @@ class UserPolicySigninServiceTest : public testing::Test {

g_browser_process->browser_policy_connector()->Init();

local_state_.reset(new TestingPrefServiceSimple);

- chrome::RegisterLocalState(local_state_->registry(), local_state_.get());

+ chrome::RegisterLocalState(local_state_.get(), local_state_->registry());

TestingBrowserProcess::GetGlobal()->SetLocalState(

local_state_.get());

@@ -99,8 +99,8 @@ class UserPolicySigninServiceTest : public testing::Test {

// up a UserCloudPolicyManager with a MockUserCloudPolicyStore.

scoped_ptr<TestingPrefServiceSyncable> prefs(

new TestingPrefServiceSyncable());

- Profile::RegisterUserPrefs(prefs.get());

- chrome::RegisterUserPrefs(prefs.get());

+ Profile::RegisterUserPrefs(prefs->registry());

+ chrome::RegisterUserPrefs(prefs.get(), prefs->registry());

TestingProfile::Builder builder;

builder.SetPrefService(scoped_ptr<PrefServiceSyncable>(prefs.Pass()));

profile_ = builder.Build().Pass();