chrome/browser/chromeos/file_manager/file_manager_browsertest.cc - Issue 1412813003: This CL replaces user_manager::UserID with AccountId.

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/file_manager/file_manager_browsertest.cc

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Fix Win GN build. Created 5 years, 1 month 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/file_manager/external_filesystem_apitest.cc ('k') | chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

index faae428cbd9add09d7f8e4f87b094543eaa512ec..d66547df50734927232c5919ade0a93e3c2f70d8 100644

--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

@@ -609,9 +609,10 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {

void AddUser(const TestAccountInfo& info, bool log_in) {

user_manager::UserManager* const user_manager =

user_manager::UserManager::Get();

+ const AccountId account_id(AccountId::FromUserEmail(info.email));

if (log_in)

- user_manager->UserLoggedIn(info.email, info.hash, false);

- user_manager->SaveUserDisplayName(info.email,

+ user_manager->UserLoggedIn(account_id, info.hash, false);

+ user_manager->SaveUserDisplayName(account_id,

base::UTF8ToUTF16(info.display_name));

SigninManagerFactory::GetForProfile(

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