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

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

Issue 2218903003: Revert of Disable crashy KioskTest.PRE_LaunchAppNetworkDown. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | no next file » | 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 922 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 StartAppLaunchFromLoginScreen(SimulateNetworkOnlineClosure()); 933 StartAppLaunchFromLoginScreen(SimulateNetworkOnlineClosure());
934 WaitForAppLaunchSuccess(); 934 WaitForAppLaunchSuccess();
935 EXPECT_EQ(extensions::Manifest::EXTERNAL_PREF, GetInstalledAppLocation()); 935 EXPECT_EQ(extensions::Manifest::EXTERNAL_PREF, GetInstalledAppLocation());
936 936
937 Profile* app_profile = ProfileManager::GetPrimaryUserProfile(); 937 Profile* app_profile = ProfileManager::GetPrimaryUserProfile();
938 ASSERT_TRUE(app_profile); 938 ASSERT_TRUE(app_profile);
939 EXPECT_FALSE( 939 EXPECT_FALSE(
940 SigninManagerFactory::GetForProfile(app_profile)->IsAuthenticated()); 940 SigninManagerFactory::GetForProfile(app_profile)->IsAuthenticated());
941 } 941 }
942 942
943 // Disabled due to crashes; https://crbug.com/634807. 943 IN_PROC_BROWSER_TEST_F(KioskTest, PRE_LaunchAppNetworkDown) {
944 IN_PROC_BROWSER_TEST_F(KioskTest, DISABLED_PRE_LaunchAppNetworkDown) {
945 // Tests the network down case for the initial app download and launch. 944 // Tests the network down case for the initial app download and launch.
946 RunAppLaunchNetworkDownTest(); 945 RunAppLaunchNetworkDownTest();
947 } 946 }
948 947
949 // Disabled due to crashes; https://crbug.com/634807. 948 IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppNetworkDown) {
950 IN_PROC_BROWSER_TEST_F(KioskTest, DISABLED_LaunchAppNetworkDown) {
951 // Tests the network down case for launching an existing app that is 949 // Tests the network down case for launching an existing app that is
952 // installed in PRE_LaunchAppNetworkDown. 950 // installed in PRE_LaunchAppNetworkDown.
953 RunAppLaunchNetworkDownTest(); 951 RunAppLaunchNetworkDownTest();
954 } 952 }
955 953
956 IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppWithNetworkConfigAccelerator) { 954 IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppWithNetworkConfigAccelerator) {
957 ScopedCanConfigureNetwork can_configure_network(true, false); 955 ScopedCanConfigureNetwork can_configure_network(true, false);
958 956
959 // Block app loading until the network screen is shown. 957 // Block app loading until the network screen is shown.
960 std::unique_ptr<base::AutoLock> lock = LockFileThread(); 958 std::unique_ptr<base::AutoLock> lock = LockFileThread();
(...skipping 1443 matching lines...) Expand 10 before | Expand all | Expand 10 after
2404 content::WindowedNotificationObserver( 2402 content::WindowedNotificationObserver(
2405 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE, 2403 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
2406 content::NotificationService::AllSources()).Wait(); 2404 content::NotificationService::AllSources()).Wait();
2407 2405
2408 // Wait for the wallpaper to load. 2406 // Wait for the wallpaper to load.
2409 WaitForWallpaper(); 2407 WaitForWallpaper();
2410 EXPECT_TRUE(wallpaper_loaded()); 2408 EXPECT_TRUE(wallpaper_loaded());
2411 } 2409 }
2412 2410
2413 } // namespace chromeos 2411 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698