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

Unified Diff: ash/system/chromeos/supervised/tray_supervised_user_unittest.cc

Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review feedback Created 4 years, 6 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/chromeos/supervised/tray_supervised_user_unittest.cc
diff --git a/ash/system/chromeos/supervised/tray_supervised_user_unittest.cc b/ash/system/chromeos/supervised/tray_supervised_user_unittest.cc
index 5ff429555d82fda993242eb0a31b3a74ba7fda89..b99c1ba22bb3f6ea31aca4d967a434117e006aca 100644
--- a/ash/system/chromeos/supervised/tray_supervised_user_unittest.cc
+++ b/ash/system/chromeos/supervised/tray_supervised_user_unittest.cc
@@ -4,7 +4,6 @@
#include "ash/system/chromeos/supervised/tray_supervised_user.h"
-#include "ash/shell.h"
#include "ash/system/user/login_status.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/test_system_tray_delegate.h"
@@ -63,9 +62,7 @@ void TraySupervisedUserInitialTest::TearDown() {
}
TEST_F(TraySupervisedUserTest, SupervisedUserHasNotification) {
- test::TestSystemTrayDelegate* delegate =
- static_cast<test::TestSystemTrayDelegate*>(
- ash::Shell::GetInstance()->system_tray_delegate());
+ test::TestSystemTrayDelegate* delegate = GetSystemTrayDelegate();
delegate->SetLoginStatus(LoginStatus::SUPERVISED);
message_center::Notification* notification = GetPopup();
@@ -83,4 +80,4 @@ TEST_F(TraySupervisedUserInitialTest, SupervisedUserNoCrash) {
notification->rich_notification_data().priority);
}
-} // namespace
+} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698