Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1396)

Unified Diff: chrome/browser/notifications/message_center_notifications_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/feedback/show_feedback_page.cc ('k') | chrome/browser/notifications/profile_notification.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/notifications/message_center_notifications_unittest.cc
diff --git a/chrome/browser/notifications/message_center_notifications_unittest.cc b/chrome/browser/notifications/message_center_notifications_unittest.cc
index 99cb8d46d27fe3c7ad12f233e1276c1bd592aa67..cdaf4770c1cfaf0dcee8f08424b875565401da0e 100644
--- a/chrome/browser/notifications/message_center_notifications_unittest.cc
+++ b/chrome/browser/notifications/message_center_notifications_unittest.cc
@@ -30,6 +30,7 @@
#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
#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 "components/signin/core/account_id/account_id.h"
#endif
namespace message_center {
@@ -114,7 +115,8 @@ TEST_F(MessageCenterNotificationManagerTest, UpdateNotification) {
#if defined(OS_CHROMEOS)
TEST_F(MessageCenterNotificationManagerTest, MultiUserUpdates) {
TestingProfile profile;
- std::string active_user_id = multi_user_util::GetUserIDFromProfile(&profile);
+ const AccountId active_user_id(
+ multi_user_util::GetAccountIdFromProfile(&profile));
chrome::MultiUserWindowManagerChromeOS* multi_user_window_manager =
new chrome::MultiUserWindowManagerChromeOS(active_user_id);
multi_user_window_manager->Init();
« no previous file with comments | « chrome/browser/feedback/show_feedback_page.cc ('k') | chrome/browser/notifications/profile_notification.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698