Merge M43: Fix crash on Enrollment screen.

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
@@ skipping 268 matching lines @@
     first_screen_name_ = screen_pref;
   }
 
   AdvanceToScreen(first_screen_name_);
   if (!IsMachineHWIDCorrect() && !StartupUtils::IsDeviceRegistered() &&
       first_screen_name_.empty())
     ShowWrongHWIDScreen();
 }
 
 ErrorScreen* WizardController::GetErrorScreen() {
-  return static_cast<ErrorScreen*>(GetScreen(kErrorScreenName));
+  return oobe_display_->GetErrorScreen();
+}
+
+BaseScreen* WizardController::GetScreen(const std::string& screen_name) {
+  if (screen_name == kErrorScreenName)
+    return GetErrorScreen();
+  return ScreenManager::GetScreen(screen_name);
 }
 
 BaseScreen* WizardController::CreateScreen(const std::string& screen_name) {
   if (screen_name == kNetworkScreenName) {
     scoped_ptr<NetworkScreen> screen(
         new NetworkScreen(this, this, oobe_display_->GetNetworkView()));
     screen->Initialize(nullptr /* context */);
     return screen.release();
-  } else if (screen_name == kErrorScreenName) {
-    scoped_ptr<ErrorScreen> screen =
-        static_cast<OobeUI*>(oobe_display_)->GetErrorScreen();
-    if (!screen)
-      screen.reset(new ErrorScreen(this, oobe_display_->GetNetworkErrorView()));
-    screen->Initialize(nullptr /* context */);
-    return screen.release();
   } else if (screen_name == kUpdateScreenName) {
     scoped_ptr<UpdateScreen> screen(new UpdateScreen(
         this, oobe_display_->GetUpdateView(), remora_controller_.get()));
     screen->Initialize(nullptr /* context */);
     return screen.release();
   } else if (screen_name == kUserImageScreenName) {
     return new UserImageScreen(this, oobe_display_->GetUserImageView());
   } else if (screen_name == kEulaScreenName) {
     return new EulaScreen(this, this, oobe_display_->GetEulaView());
   } else if (screen_name == kEnrollmentScreenName) {
@@ skipping 994 matching lines @@
   }
 
   EnrollmentScreen* screen = EnrollmentScreen::Get(this);
   screen->SetParameters(effective_config, shark_controller_.get(),
                         remora_controller_.get());
   SetStatusAreaVisible(true);
   SetCurrentScreen(screen);
 }
 
 }  // namespace chromeos