chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc - Issue 1428213004: This CL replaces std::string user_id in ash/* 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/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc

Issue 1428213004: This CL replaces std::string user_id in ash/* with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update after review. 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/ui/ash/multi_user/multi_user_context_menu_chromeos.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc

diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc

index ae0a23f9eef9c41b43a76c80521d028bcea24ac7..bd3fecc5081a112e249e75cbd731220bc9c56440 100644

--- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc

+++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc

@@ -13,6 +13,7 @@

#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"

#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"

#include "chrome/common/chrome_switches.h"

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

#include "ui/base/models/menu_model.h"

#include "ui/base/ui_base_types.h"

@@ -59,7 +60,8 @@ void MultiUserContextMenuChromeOSTest::SetUp() {

window_ = CreateTestWindowInShellWithId(0);

window_->Show();

- multi_user_window_manager_ = new chrome::MultiUserWindowManagerChromeOS("A");

+ multi_user_window_manager_ =

+ new chrome::MultiUserWindowManagerChromeOS(AccountId::FromUserEmail("A"));

multi_user_window_manager_->Init();

chrome::MultiUserWindowManager::SetInstanceForTest(multi_user_window_manager_,

chrome::MultiUserWindowManager::MULTI_PROFILE_MODE_SEPARATED);

@@ -86,7 +88,8 @@ TEST_F(MultiUserContextMenuChromeOSTest, UnownedWindow) {

TEST_F(MultiUserContextMenuChromeOSTest, OwnedWindow) {

// Make the window owned and check that there is no menu (since only a single

// user exists).

- multi_user_window_manager()->SetWindowOwner(window(), "A");

+ multi_user_window_manager()->SetWindowOwner(window(),

+ AccountId::FromUserEmail("A"));

EXPECT_EQ(NULL, CreateMultiUserContextMenu(window()).get());

// After adding another user a menu should get created.