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

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

Issue 213253007: Revert of Added shortcut for NW config screen in kiosk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 22e8c02d340bfce32d71944083cfc8a73d77b7c0..f81a2dda50b6a610e5c016157a206ee7721420ec 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -588,37 +588,6 @@
RunAppLaunchNetworkDownTest();
}
-IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppWithNetworkConfigAccelerator) {
- ScopedCanConfigureNetwork can_configure_network(true, false);
-
- // Start app launch and wait for network connectivity timeout.
- StartAppLaunchFromLoginScreen(SimulateNetworkOnlineClosure());
- OobeScreenWaiter splash_waiter(OobeDisplay::SCREEN_APP_LAUNCH_SPLASH);
- splash_waiter.Wait();
-
- // A network error screen should be shown after authenticating.
- OobeScreenWaiter error_screen_waiter(OobeDisplay::SCREEN_ERROR_MESSAGE);
- // Simulate Ctrl+Alt+N accelerator.
- GetLoginUI()->CallJavascriptFunction(
- "cr.ui.Oobe.handleAccelerator",
- base::StringValue("app_launch_network_config"));
- error_screen_waiter.Wait();
- ASSERT_TRUE(GetAppLaunchController()->showing_network_dialog());
-
- // Continue button should be visible since we are online.
- JsExpect("$('continue-network-config-btn').hidden == false");
-
- // Click on [Continue] button.
- ASSERT_TRUE(content::ExecuteScript(
- GetLoginUI()->GetWebContents(),
- "(function() {"
- "var e = new Event('click');"
- "$('continue-network-config-btn').dispatchEvent(e);"
- "})();"));
-
- WaitForAppLaunchSuccess();
-}
-
IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppNetworkDownConfigureNotAllowed) {
// Mock network could not be configured.
ScopedCanConfigureNetwork can_configure_network(false, true);

Powered by Google App Engine
This is Rietveld 408576698