chrome/browser/download/notification/download_notification_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/download/notification/download_notification_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/settings/device_settings_test_helper.cc ('k') | chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/download/notification/download_notification_browsertest.cc

diff --git a/chrome/browser/download/notification/download_notification_browsertest.cc b/chrome/browser/download/notification/download_notification_browsertest.cc

index 98f81ea283d4bd14ddb54e9cd47b202fe62c8d1a..fe7205c1b4191f138d5f9927294afdbcb8612116 100644

--- a/chrome/browser/download/notification/download_notification_browsertest.cc

+++ b/chrome/browser/download/notification/download_notification_browsertest.cc

@@ -1194,10 +1194,12 @@ class MultiProfileDownloadNotificationTest

user_manager::UserManager* const user_manager =

user_manager::UserManager::Get();

if (log_in)

- user_manager->UserLoggedIn(AccountId::FromUserEmail(info.email),

- info.hash, false);

- user_manager->SaveUserDisplayName(AccountId::FromUserEmail(info.email),

- base::UTF8ToUTF16(info.display_name));

+ user_manager->UserLoggedIn(

+ AccountId::FromUserEmailGaiaId(info.email, info.gaia_id), info.hash,

+ false);

+ user_manager->SaveUserDisplayName(

+ AccountId::FromUserEmailGaiaId(info.email, info.gaia_id),

+ base::UTF8ToUTF16(info.display_name));

SigninManagerFactory::GetForProfile(

chromeos::ProfileHelper::GetProfileByUserIdHash(info.hash))

->SetAuthenticatedAccountInfo(info.gaia_id, info.email);