Index: chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc |
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc |
index f68e6fc51651d9a35ccd0d87d0bdb2d56694f187..a5d807cf98530e357acabfca16b10c08a467606a 100644 |
--- a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc |
+++ b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc |
@@ -14,6 +14,7 @@ |
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h" |
#include "chrome/test/base/testing_browser_process.h" |
#include "chrome/test/base/testing_profile_manager.h" |
+#include "components/signin/core/account_id/account_id.h" |
#include "components/user_manager/fake_user_manager.h" |
#include "components/user_manager/user_info.h" |
#include "ui/message_center/message_center.h" |
@@ -48,7 +49,8 @@ class MultiUserNotificationBlockerChromeOSTest |
ash::test::TestSessionStateDelegate* session_state_delegate = |
static_cast<ash::test::TestSessionStateDelegate*>( |
ash::Shell::GetInstance()->session_state_delegate()); |
- session_state_delegate->AddUser("test2@example.com"); |
+ session_state_delegate->AddUser( |
+ AccountId::FromUserEmail("test2@example.com")); |
chromeos::WallpaperManager::Initialize(); |
@@ -95,12 +97,14 @@ class MultiUserNotificationBlockerChromeOSTest |
} |
void SwitchActiveUser(const std::string& name) { |
- ash::Shell::GetInstance()->session_state_delegate()->SwitchActiveUser(name); |
+ const AccountId account_id(AccountId::FromUserEmail(name)); |
+ ash::Shell::GetInstance()->session_state_delegate()->SwitchActiveUser( |
+ account_id); |
if (chrome::MultiUserWindowManager::GetMultiProfileMode() == |
chrome::MultiUserWindowManager::MULTI_PROFILE_MODE_SEPARATED) { |
static_cast<chrome::MultiUserWindowManagerChromeOS*>( |
- chrome::MultiUserWindowManager::GetInstance())->ActiveUserChanged( |
- name); |
+ chrome::MultiUserWindowManager::GetInstance()) |
+ ->ActiveUserChanged(account_id); |
} |
} |
@@ -128,7 +132,8 @@ class MultiUserNotificationBlockerChromeOSTest |
aura::Window* CreateWindowForProfile(const std::string& name) { |
aura::Window* window = CreateTestWindowInShellWithId(window_id_++); |
- chrome::MultiUserWindowManager::GetInstance()->SetWindowOwner(window, name); |
+ chrome::MultiUserWindowManager::GetInstance()->SetWindowOwner( |
+ window, AccountId::FromUserEmail(name)); |
return window; |
} |