chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc - Issue 270663002: Implemented profile-aware owner key loading.

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/policy/login_screen_default_policy_browsertest.cc

Issue 270663002: Implemented profile-aware owner key loading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed tests. Created 6 years, 7 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

« chrome/browser/chromeos/login/user_manager_impl.cc ('K') | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | chrome/browser/chromeos/policy/power_policy_browsertest.cc » ('j') | chrome/browser/chromeos/profiles/profile_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

diff --git a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

index d37f7afa090cadc1091fc9adc764e843462bb23f..6405b4b2dfe258943fdb9c3cc8ec1a303de64576 100644

--- a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

+++ b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

@@ -222,7 +222,8 @@ void LoginScreenDefaultPolicyInSessionBrowsertest::SetUpOnMainThread() {

LoginScreenDefaultPolicyBrowsertestBase::SetUpOnMainThread();

// Tell the DeviceSettingsService that there is no local owner.

- chromeos::DeviceSettingsService::Get()->SetUsername(std::string());

+ crypto::ScopedPK11Slot slot;

+ chromeos::DeviceSettingsService::Get()->InitOwner(std::string(), slot.Pass());

}

void LoginScreenDefaultPolicyInSessionBrowsertest::VerifyPrefFollowsDefault(