chrome/browser/chromeos/policy/power_policy_browsertest.cc - Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier.

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/power_policy_browsertest.cc

Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed unit tests. Created 4 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

« no previous file with comments | « chrome/browser/chromeos/policy/device_local_account_browsertest.cc ('k') | chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4f95ae9b00056fc679c1f1142cd6a0fa0b80a820..6d090245ac74d4d9c649f836120a138590c61761 100644

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

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

@@ -206,7 +206,7 @@ void PowerPolicyBrowserTestBase::InstallUserKey() {

ASSERT_TRUE(PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &user_keys_dir));

std::string sanitized_username =

chromeos::CryptohomeClient::GetStubSanitizedUsername(

- chromeos::login::StubAccountId().GetUserEmail());

+ cryptohome::Identification(chromeos::login::StubAccountId()));

base::FilePath user_key_file =

user_keys_dir.AppendASCII(sanitized_username)

.AppendASCII("policy.pub");

@@ -224,7 +224,8 @@ void PowerPolicyBrowserTestBase::StoreAndReloadUserPolicy() {

// Install the new user policy blob in session manager client.

user_policy_.Build();

session_manager_client()->set_user_policy(

- user_policy_.policy_data().username(),

+ cryptohome::Identification(

+ AccountId::FromUserEmail(user_policy_.policy_data().username())),

user_policy_.GetBlob());

// Reload user policy from session manager client and wait for the update to