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

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

Issue 2107353002: Fix the flaky test KioskTest.LaunchAppUserCancel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: UI_STATE_UNKNOWN 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
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 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after
1030 OobeScreenWaiter(OobeScreen::SCREEN_ERROR_MESSAGE).Wait(); 1030 OobeScreenWaiter(OobeScreen::SCREEN_ERROR_MESSAGE).Wait();
1031 1031
1032 ASSERT_TRUE(GetAppLaunchController()->showing_network_dialog()); 1032 ASSERT_TRUE(GetAppLaunchController()->showing_network_dialog());
1033 SimulateNetworkOnline(); 1033 SimulateNetworkOnline();
1034 WaitForAppLaunchSuccess(); 1034 WaitForAppLaunchSuccess();
1035 } 1035 }
1036 1036
1037 IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppUserCancel) { 1037 IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppUserCancel) {
1038 // Make fake_cws_ return empty update response. 1038 // Make fake_cws_ return empty update response.
1039 set_test_app_version(""); 1039 set_test_app_version("");
1040 OobeScreenWaiter splash_waiter(OobeScreen::SCREEN_APP_LAUNCH_SPLASH);
1040 StartAppLaunchFromLoginScreen(SimulateNetworkOfflineClosure()); 1041 StartAppLaunchFromLoginScreen(SimulateNetworkOfflineClosure());
1041 OobeScreenWaiter splash_waiter(OobeScreen::SCREEN_APP_LAUNCH_SPLASH);
1042 splash_waiter.Wait(); 1042 splash_waiter.Wait();
1043 1043
1044 settings_helper_.SetBoolean( 1044 settings_helper_.SetBoolean(
1045 kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled, true); 1045 kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled, true);
1046 content::WindowedNotificationObserver signal( 1046 content::WindowedNotificationObserver signal(
1047 chrome::NOTIFICATION_APP_TERMINATING, 1047 chrome::NOTIFICATION_APP_TERMINATING,
1048 content::NotificationService::AllSources()); 1048 content::NotificationService::AllSources());
1049 GetLoginUI()->CallJavascriptFunctionUnsafe( 1049 GetLoginUI()->CallJavascriptFunctionUnsafe(
1050 "cr.ui.Oobe.handleAccelerator", base::StringValue("app_launch_bailout")); 1050 "cr.ui.Oobe.handleAccelerator", base::StringValue("app_launch_bailout"));
1051 signal.Wait(); 1051 signal.Wait();
(...skipping 1358 matching lines...) Expand 10 before | Expand all | Expand 10 after
2410 content::WindowedNotificationObserver( 2410 content::WindowedNotificationObserver(
2411 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE, 2411 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
2412 content::NotificationService::AllSources()).Wait(); 2412 content::NotificationService::AllSources()).Wait();
2413 2413
2414 // Wait for the wallpaper to load. 2414 // Wait for the wallpaper to load.
2415 WaitForWallpaper(); 2415 WaitForWallpaper();
2416 EXPECT_TRUE(wallpaper_loaded()); 2416 EXPECT_TRUE(wallpaper_loaded());
2417 } 2417 }
2418 2418
2419 } // namespace chromeos 2419 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/chromeos/login/ui/webui_login_display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698