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

Unified Diff: chrome/browser/chromeos/login/kiosk_browsertest.cc

Issue 900553006: Updated KioskAppManager to track whether an app was auto-launched. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed review comments. Created 5 years, 10 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/chromeos/login/kiosk_browsertest.cc
diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc
index 37a3ae7a4a48750eb4549d4bd0b5b1e54bfe756c..6286aac8ea0ce35a8a9feb17d1e6c710cf020682 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -807,6 +807,9 @@ class KioskTest : public OobeBaseTest {
IN_PROC_BROWSER_TEST_F(KioskTest, InstallAndLaunchApp) {
StartAppLaunchFromLoginScreen(SimulateNetworkOnlineClosure());
WaitForAppLaunchSuccess();
+ KioskAppManager::App app;
+ ASSERT_TRUE(KioskAppManager::Get()->GetApp(test_app_id(), &app));
+ EXPECT_FALSE(app.was_auto_launched_with_zero_delay);
}
IN_PROC_BROWSER_TEST_F(KioskTest, ZoomSupport) {
@@ -1082,6 +1085,10 @@ IN_PROC_BROWSER_TEST_F(KioskTest, AutolaunchWarningConfirm) {
EXPECT_TRUE(KioskAppManager::Get()->IsAutoLaunchEnabled());
WaitForAppLaunchSuccess();
+
+ KioskAppManager::App app;
+ ASSERT_TRUE(KioskAppManager::Get()->GetApp(test_app_id(), &app));
+ EXPECT_TRUE(app.was_auto_launched_with_zero_delay);
}
IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableCancel) {
@@ -1256,10 +1263,10 @@ IN_PROC_BROWSER_TEST_F(KioskTest, NoEnterpriseAutoLaunchWhenUntrusted) {
// Trigger the code that handles auto-launch on enterprise devices. This would
// normally be called from ShowLoginWizard(), which runs so early that it is
- // not to inject an auto-launch policy before it runs.
+ // not possible to inject an auto-launch policy before it runs.
LoginDisplayHost* login_display_host = LoginDisplayHostImpl::default_host();
ASSERT_TRUE(login_display_host);
- login_display_host->StartAppLaunch(test_app_id(), false);
+ login_display_host->StartAppLaunch(test_app_id(), false, true);
// Check that no launch has started.
EXPECT_FALSE(login_display_host->GetAppLaunchController());

Powered by Google App Engine
This is Rietveld 408576698