chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_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/login/users/wallpaper/wallpaper_manager_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/login/users/wallpaper/wallpaper_manager.cc ('k') | chrome/browser/chromeos/policy/affiliation_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc

diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc

index 9e6c82e2ea569e19ee34344094ee99188d8ed82d..16ec162d7ad93e5036bb42dae04a3691f7040bc0 100644

--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc

+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc

@@ -150,7 +150,8 @@ class WallpaperManagerPolicyTest

base::FilePath user_keys_dir;

EXPECT_TRUE(PathService::Get(DIR_USER_POLICY_KEYS, &user_keys_dir));

const std::string sanitized_user_id =

- CryptohomeClient::GetStubSanitizedUsername(account_id.GetUserEmail());

+ CryptohomeClient::GetStubSanitizedUsername(

+ cryptohome::Identification(account_id));

const base::FilePath user_key_file =

user_keys_dir.AppendASCII(sanitized_user_id)

.AppendASCII("policy.pub");

@@ -252,8 +253,8 @@ class WallpaperManagerPolicyTest

builder->payload().Clear();

}

builder->Build();

- fake_session_manager_client_->set_user_policy(account_id.GetUserEmail(),

- builder->GetBlob());

+ fake_session_manager_client_->set_user_policy(

+ cryptohome::Identification(account_id), builder->GetBlob());

const user_manager::User* user =

user_manager::UserManager::Get()->FindUser(account_id);

ASSERT_TRUE(user);