ash/system/user/tray_user_unittest.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: ash/system/user/tray_user_unittest.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: Rebased. Created 5 years, 2 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

Index: ash/system/user/tray_user_unittest.cc

diff --git a/ash/system/user/tray_user_unittest.cc b/ash/system/user/tray_user_unittest.cc

index 5d9d3d3ab9bc6ee74843aabc55f84bedf4aa4448..dc40fe705b5ae679c9055edac8fb2b2dd0efdf85 100644

--- a/ash/system/user/tray_user_unittest.cc

+++ b/ash/system/user/tray_user_unittest.cc

@@ -17,6 +17,7 @@

#include "ash/test/test_session_state_delegate.h"

#include "ash/test/test_shell_delegate.h"

#include "base/strings/utf_string_conversions.h"

+#include "components/signin/core/account_id/account_id.h"

#include "components/user_manager/user_info.h"

#include "ui/accessibility/ax_view_state.h"

#include "ui/events/test/event_generator.h"

@@ -275,7 +276,7 @@ TEST_F(TrayUserTest, MutiUserModeButtonClicks) {

EXPECT_EQ(active_user->GetUserID(), second_user->GetUserID());

// Since the name is capitalized, the email should be different then the

// user_id.

- EXPECT_NE(active_user->GetUserID(), second_user->GetEmail());

+ EXPECT_NE(active_user->GetUserID().GetUserEmail(), second_user->GetEmail());

tray()->CloseSystemBubble();

}

« ash/system/user/tray_user.cc ('K') | « ash/system/user/tray_user.cc ('k') | ash/system/user/user_view.cc » ('j') | ash/system/user/user_view.cc » ('J')