Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
index f8a981d54b7bb8fc1759dd468ceb678136869a21..2f48601fb7eb845f7c7a8e6c3931d06ca8cebe74 100644 |
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
@@ -618,6 +618,14 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
storage_monitor_.reset(new StorageMonitorCros()); |
+ // Make sure that wallpaper boot transition and other delays in OOBE |
+ // are disabled for tests and kiosk app launch by default. |
+ // Individual tests may enable them if they want. |
+ if (parsed_command_line().HasSwitch(::switches::kTestType) || |
+ ShouldAutoLaunchKioskApp(parsed_command_line())) { |
+ WizardController::SetZeroDelays(); |
+ } |
+ |
// In Aura builds this will initialize ash::Shell. |
ChromeBrowserMainPartsLinux::PreProfileInit(); |
} |
@@ -644,12 +652,6 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() { |
g_browser_process->browser_policy_connector()-> |
GetNetworkConfigurationUpdater(); |
- // Make sure that wallpaper boot transition and other delays in OOBE |
- // are disabled for tests by default. |
- // Individual tests may enable them if they want. |
- if (parsed_command_line().HasSwitch(::switches::kTestType)) |
- WizardController::SetZeroDelays(); |
- |
// Start loading the machine statistics. Note: if we start loading machine |
// statistics early in PreEarlyInitialization() then the crossystem tool |
// sometimes hangs for unknown reasons, see http://crbug.com/167671. |