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

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc

Issue 2198363002: Pass Notification into NotificationBlocker ShouldShow* methods (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Ash build errors Created 4 years, 4 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: 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 5be0b064b52342d926b910fdc38752b618ad0775..60b58669126678c338f828c66e18da187f9fb81e 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
@@ -9,6 +9,7 @@
#include "ash/test/test_session_state_delegate.h"
#include "ash/test/test_shell_delegate.h"
#include "base/macros.h"
+#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h"
@@ -21,6 +22,8 @@
#include "ui/message_center/message_center.h"
#include "ui/message_center/notification.h"
+using base::UTF8ToUTF16;
+
class MultiUserNotificationBlockerChromeOSTest
: public ash::test::AshTestBase,
public message_center::NotificationBlocker::Observer {
@@ -116,7 +119,14 @@ class MultiUserNotificationBlockerChromeOSTest
const std::string profile_id) {
message_center::NotifierId id_with_profile = notifier_id;
id_with_profile.profile_id = profile_id;
- return blocker()->ShouldShowNotificationAsPopup(id_with_profile);
+
+ message_center::Notification notification(
+ message_center::NOTIFICATION_TYPE_SIMPLE, "popup-id",
+ UTF8ToUTF16("popup-title"), UTF8ToUTF16("popup-message"), gfx::Image(),
+ UTF8ToUTF16("popup-source"), GURL(), id_with_profile,
+ message_center::RichNotificationData(), NULL);
+
+ return blocker()->ShouldShowNotificationAsPopup(notification);
}
bool ShouldShowNotification(
@@ -124,7 +134,14 @@ class MultiUserNotificationBlockerChromeOSTest
const std::string profile_id) {
message_center::NotifierId id_with_profile = notifier_id;
id_with_profile.profile_id = profile_id;
- return blocker()->ShouldShowNotification(id_with_profile);
+
+ message_center::Notification notification(
+ message_center::NOTIFICATION_TYPE_SIMPLE, "notification-id",
+ UTF8ToUTF16("notification-title"), UTF8ToUTF16("notification-message"),
+ gfx::Image(), UTF8ToUTF16("notification-source"), GURL(),
+ id_with_profile, message_center::RichNotificationData(), NULL);
+
+ return blocker()->ShouldShowNotification(notification);
}
aura::Window* CreateWindowForProfile(const std::string& name) {

Powered by Google App Engine
This is Rietveld 408576698