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

Unified Diff: ash/common/system/update/tray_update_unittest.cc

Issue 2408273002: mash: Port TrayUpdateTest to AshTest (Closed)
Patch Set: WmShellTestApi Created 4 years, 2 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
« no previous file with comments | « ash/common/BUILD.gn ('k') | ash/common/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/update/tray_update_unittest.cc
diff --git a/ash/common/system/update/tray_update_unittest.cc b/ash/common/system/update/tray_update_unittest.cc
index 71abb8705773c743fa0a1da253c9ca8ab17fff9b..1c6c796dbfaa3752e9b15abfa97b42957a32b0de 100644
--- a/ash/common/system/update/tray_update_unittest.cc
+++ b/ash/common/system/update/tray_update_unittest.cc
@@ -5,15 +5,14 @@
#include "ash/common/system/update/tray_update.h"
#include "ash/common/system/tray/system_tray.h"
+#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/system/tray/system_tray_notifier.h"
-#include "ash/common/test/test_system_tray_delegate.h"
+#include "ash/common/test/ash_test.h"
#include "ash/common/wm_shell.h"
-#include "ash/test/ash_test_base.h"
-#include "base/macros.h"
namespace ash {
-using TrayUpdateTest = test::AshTestBase;
+using TrayUpdateTest = AshTest;
// Tests that the update icon becomes visible when an update becomes
// available.
@@ -21,9 +20,8 @@ TEST_F(TrayUpdateTest, VisibilityAfterUpdate) {
TrayUpdate* tray_update = GetPrimarySystemTray()->GetTrayUpdateForTesting();
// The system starts with no update pending.
- test::TestSystemTrayDelegate* tray_delegate = GetSystemTrayDelegate();
UpdateInfo initial_info;
- tray_delegate->GetSystemUpdateInfo(&initial_info);
+ WmShell::Get()->system_tray_delegate()->GetSystemUpdateInfo(&initial_info);
EXPECT_FALSE(initial_info.update_required);
// When no update is pending, the item isn't visible.
« no previous file with comments | « ash/common/BUILD.gn ('k') | ash/common/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698