Merge 199159 "Removed visual jank during kiosk app launch caused..."

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
===================================================================
--- chrome/browser/chromeos/chrome_browser_main_chromeos.cc	(revision 199331)
+++ chrome/browser/chromeos/chrome_browser_main_chromeos.cc	(working copy)
@@ -614,6 +614,14 @@
 
   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();
 }
@@ -640,12 +648,6 @@
   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.