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 e57a174593821d12e72368cf35bd2e7afe446cd9..6878a5e97253fd3c8b925f876bc7ab2e51763e4e 100644 |
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
@@ -35,6 +35,7 @@ |
#include "chrome/browser/chromeos/login/screen_locker.h" |
#include "chrome/browser/chromeos/login/user_manager.h" |
#include "chrome/browser/chromeos/login/wallpaper_manager.h" |
+#include "chrome/browser/chromeos/login/wizard_controller.h" |
#include "chrome/browser/chromeos/low_memory_observer.h" |
#include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" |
#include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h" |
@@ -419,6 +420,12 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() { |
chromeos::CrosLibrary::Get()->GetNetworkLibrary())); |
} |
+ // 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)) |
+ chromeos::WizardController::SetZeroDelays(); |
+ |
// Tests should be able to tune login manager before showing it. |
// Thus only show login manager in normal (non-testing) mode. |
if (!parameters().ui_task) |