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

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.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
Index: chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
index 8d3752fdc786791784bf311bddae54622d35b4dc..b061e67fa5f22e9da1576509914f31c3fd98d10b 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
@@ -13,8 +13,6 @@
#include "ash/common/system/date/tray_date.h"
#include "ash/common/system/date/tray_system_info.h"
#include "ash/common/system/tray/system_tray.h"
-#include "ash/common/system/update/tray_update.h"
-#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "base/macros.h"
#include "chrome/browser/chromeos/login/login_manager_test.h"
@@ -131,29 +129,4 @@ IN_PROC_BROWSER_TEST_F(SystemTrayDelegateChromeOSTest,
EXPECT_EQ(base::k24HourClock, GetHourType());
}
-// Test that a flash update causes the update UI to show in the system menu.
-IN_PROC_BROWSER_TEST_F(SystemTrayDelegateChromeOSTest,
- TestFlashUpdateTrayIcon) {
- ash::TrayUpdate* tray_update = ash::Shell::GetInstance()
- ->GetPrimarySystemTray()
- ->GetTrayUpdateForTesting();
-
- ash::UpdateInfo initial_info;
- ash::WmShell::Get()->system_tray_delegate()->GetSystemUpdateInfo(
- &initial_info);
- EXPECT_FALSE(initial_info.update_required);
-
- // When no update is pending, the item isn't visible.
- EXPECT_FALSE(tray_update->tray_view()->visible());
-
- chromeos::SystemTrayDelegateChromeOS::instance()->SetFlashUpdateAvailable();
-
- ash::UpdateInfo post_info;
- ash::WmShell::Get()->system_tray_delegate()->GetSystemUpdateInfo(&post_info);
- EXPECT_TRUE(post_info.update_required);
-
- // Tray item is now visible.
- EXPECT_TRUE(tray_update->tray_view()->visible());
-}
-
} // namespace chromeos
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698