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

Side by Side Diff: chrome/browser/chromeos/login/kiosk_browsertest.cc

Issue 2108843002: kiosk: Fix OobeScreenWaiter get wrong current screen (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <memory> 5 #include <memory>
6 #include <vector> 6 #include <vector>
7 7
8 #include "ash/desktop_background/desktop_background_controller.h" 8 #include "ash/desktop_background/desktop_background_controller.h"
9 #include "ash/desktop_background/desktop_background_controller_observer.h" 9 #include "ash/desktop_background/desktop_background_controller_observer.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 970 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 "var e = new Event('click');" 981 "var e = new Event('click');"
982 "$('continue-network-config-btn').dispatchEvent(e);" 982 "$('continue-network-config-btn').dispatchEvent(e);"
983 "})();")); 983 "})();"));
984 984
985 // Let app launching resume. 985 // Let app launching resume.
986 lock.reset(); 986 lock.reset();
987 987
988 WaitForAppLaunchSuccess(); 988 WaitForAppLaunchSuccess();
989 } 989 }
990 990
991 #if defined(OS_CHROMEOS) 991 IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppNetworkDownConfigureNotAllowed) {
992 #define MAYBE_LaunchAppNetworkDownConfigureNotAllowed \
993 DISABLED_LaunchAppNetworkDownConfigureNotAllowed
994 #else
995 #define MAYBE_LaunchAppNetworkDownConfigureNotAllowed \
996 LaunchAppNetworkDownConfigureNotAllowed
997 #endif
998 IN_PROC_BROWSER_TEST_F(KioskTest,
999 MAYBE_LaunchAppNetworkDownConfigureNotAllowed) {
1000 // Mock network could not be configured. 992 // Mock network could not be configured.
1001 ScopedCanConfigureNetwork can_configure_network(false, true); 993 ScopedCanConfigureNetwork can_configure_network(false, true);
1002 994
1003 // Start app launch and wait for network connectivity timeout. 995 // Start app launch and wait for network connectivity timeout.
1004 StartAppLaunchFromLoginScreen(SimulateNetworkOfflineClosure()); 996 StartAppLaunchFromLoginScreen(SimulateNetworkOfflineClosure());
1005 OobeScreenWaiter splash_waiter(OobeScreen::SCREEN_APP_LAUNCH_SPLASH); 997 OobeScreenWaiter splash_waiter(OobeScreen::SCREEN_APP_LAUNCH_SPLASH);
1006 splash_waiter.Wait(); 998 splash_waiter.Wait();
1007 WaitForAppLaunchNetworkTimeout(); 999 WaitForAppLaunchNetworkTimeout();
1008 1000
1009 // Configure network link should not be visible. 1001 // Configure network link should not be visible.
(...skipping 1400 matching lines...) Expand 10 before | Expand all | Expand 10 after
2410 content::WindowedNotificationObserver( 2402 content::WindowedNotificationObserver(
2411 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE, 2403 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
2412 content::NotificationService::AllSources()).Wait(); 2404 content::NotificationService::AllSources()).Wait();
2413 2405
2414 // Wait for the wallpaper to load. 2406 // Wait for the wallpaper to load.
2415 WaitForWallpaper(); 2407 WaitForWallpaper();
2416 EXPECT_TRUE(wallpaper_loaded()); 2408 EXPECT_TRUE(wallpaper_loaded());
2417 } 2409 }
2418 2410
2419 } // namespace chromeos 2411 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698