[cros] Flip enable-new-oobe switch.

chrome/browser/chromeos/login/webui_login_display_host.cc

Index: chrome/browser/chromeos/login/webui_login_display_host.cc
diff --git a/chrome/browser/chromeos/login/webui_login_display_host.cc b/chrome/browser/chromeos/login/webui_login_display_host.cc
index 8f716687f12e77af8d855a6fd957646ad1b0defe..5726e60d2b33a2fd97525b631ea0f57c311f64e6 100644
--- a/chrome/browser/chromeos/login/webui_login_display_host.cc
+++ b/chrome/browser/chromeos/login/webui_login_display_host.cc
@@ -58,10 +58,13 @@ WebUILoginDisplayHost::WebUILoginDisplayHost(const gfx::Rect& background_bounds)
   bool is_registered = WizardController::IsDeviceRegistered();
   // TODO(nkostylev): Add switch to disable wallpaper transition on OOBE.
   // Should be used on test images so that they are not slowed down.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNewOobe))
+  bool zero_delay_enabled = WizardController::IsZeroDelayEnabled();
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe) &&
+      !zero_delay_enabled) {
     waiting_for_wallpaper_load_ = !is_registered;
-  else
+  } else {
     waiting_for_wallpaper_load_ = false;
+  }
 
   if (waiting_for_wallpaper_load_) {
     registrar_.Add(this, chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED,
@@ -184,7 +187,7 @@ void WebUILoginDisplayHost::LoadURL(const GURL& url) {
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.bounds = background_bounds();
     params.show_state = ui::SHOW_STATE_FULLSCREEN;
-    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNewOobe))
+    if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe))
       params.transparent = true;
     params.parent =
         ash::Shell::GetContainer(