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

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

Issue 2558043006: ash: Use system tray mojo interface to show system update tray icon (Closed)
Patch Set: fix gcc Created 4 years 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/system/update/tray_update.cc ('k') | ash/common/system/update/update_observer.h » ('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 1c6c796dbfaa3752e9b15abfa97b42957a32b0de..18007c8036cc8927b0e4f529ae82db5e9d6cf96c 100644
--- a/ash/common/system/update/tray_update_unittest.cc
+++ b/ash/common/system/update/tray_update_unittest.cc
@@ -5,10 +5,10 @@
#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/system/tray/system_tray_controller.h"
#include "ash/common/test/ash_test.h"
#include "ash/common/wm_shell.h"
+#include "ash/public/interfaces/update.mojom.h"
namespace ash {
@@ -17,20 +17,14 @@ using TrayUpdateTest = AshTest;
// Tests that the update icon becomes visible when an update becomes
// available.
TEST_F(TrayUpdateTest, VisibilityAfterUpdate) {
- TrayUpdate* tray_update = GetPrimarySystemTray()->GetTrayUpdateForTesting();
+ TrayUpdate* tray_update = GetPrimarySystemTray()->tray_update();
- // The system starts with no update pending.
- UpdateInfo 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.
+ // The system starts with no update pending, so the icon isn't visible.
EXPECT_FALSE(tray_update->tray_view()->visible());
// Simulate an update.
- UpdateInfo info;
- info.update_required = true;
- WmShell::Get()->system_tray_notifier()->NotifyUpdateRecommended(info);
+ WmShell::Get()->system_tray_controller()->ShowUpdateIcon(
+ mojom::UpdateSeverity::LOW, false);
// Tray item is now visible.
EXPECT_TRUE(tray_update->tray_view()->visible());
« no previous file with comments | « ash/common/system/update/tray_update.cc ('k') | ash/common/system/update/update_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698