Merge M43: Fix crash on Enrollment screen.

chrome/browser/ui/webui/chromeos/login/oobe_ui.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/ui/webui/chromeos/login/oobe_ui.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
@@ skipping 272 matching lines @@
   AddScreenHandler(auto_enrollment_check_screen_handler);
 
   HIDDetectionScreenHandler* hid_detection_screen_handler =
       new HIDDetectionScreenHandler(core_handler_);
   hid_detection_view_ = hid_detection_screen_handler;
   AddScreenHandler(hid_detection_screen_handler);
 
   error_screen_handler_ = new ErrorScreenHandler();
   AddScreenHandler(error_screen_handler_);
 
-  // Initialize ErrorScreen if it hasn't initialized so that NetworkErrorModel
-  // is binded properly.
-  NetworkErrorModel* network_error_model = nullptr;
-  if (WizardController::default_controller()) {
-    network_error_model = static_cast<NetworkErrorModel*>(
-        WizardController::default_controller()->GetScreen(
-            WizardController::kErrorScreenName));
-    CHECK(network_error_model);
-  } else {
-    error_screen_.reset(new ErrorScreen(nullptr, error_screen_handler_));
-    network_error_model = error_screen_.get();
-  }
+  error_screen_.reset(new ErrorScreen(nullptr, error_screen_handler_));
+  NetworkErrorModel* network_error_model = error_screen_.get();
 
   EnrollmentScreenHandler* enrollment_screen_handler =
       new EnrollmentScreenHandler(network_state_informer_, network_error_model);
   enrollment_screen_actor_ = enrollment_screen_handler;
   AddScreenHandler(enrollment_screen_handler);
 
   TermsOfServiceScreenHandler* terms_of_service_screen_handler =
       new TermsOfServiceScreenHandler(core_handler_);
   terms_of_service_screen_actor_ = terms_of_service_screen_handler;
   AddScreenHandler(terms_of_service_screen_handler);
@@ skipping 142 matching lines @@
 }
 
 DeviceDisabledScreenActor* OobeUI::GetDeviceDisabledScreenActor() {
   return device_disabled_screen_actor_;
 }
 
 UserImageView* OobeUI::GetUserImageView() {
   return user_image_view_;
 }
 
-NetworkErrorView* OobeUI::GetNetworkErrorView() {
-  return error_screen_handler_;
+ErrorScreen* OobeUI::GetErrorScreen() {
+  return error_screen_.get();
 }
 
 SupervisedUserCreationScreenHandler*
     OobeUI::GetSupervisedUserCreationScreenActor() {
   return supervised_user_creation_screen_actor_;
 }
 
 GaiaScreenHandler* OobeUI::GetGaiaScreenActor() {
   return gaia_screen_handler_;
 }
@@ skipping 37 matching lines @@
 
   bool keyboard_driven_oobe =
       system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation();
   localized_strings->SetString("highlightStrength",
                                keyboard_driven_oobe ? "strong" : "normal");
 
   bool new_kiosk_ui = KioskAppMenuHandler::EnableNewKioskUI();
   localized_strings->SetString("newKioskUI", new_kiosk_ui ? "on" : "off");
 }
 
-scoped_ptr<ErrorScreen> OobeUI::GetErrorScreen() {
-  return error_screen_.Pass();
-}
-
 void OobeUI::InitializeScreenMaps() {
   screen_names_.resize(SCREEN_UNKNOWN);
   screen_names_[SCREEN_OOBE_HID_DETECTION] = kScreenOobeHIDDetection;
   screen_names_[SCREEN_OOBE_NETWORK] = kScreenOobeNetwork;
   screen_names_[SCREEN_OOBE_EULA] = kScreenOobeEula;
   screen_names_[SCREEN_OOBE_UPDATE] = kScreenOobeUpdate;
   screen_names_[SCREEN_OOBE_ENROLLMENT] = kScreenOobeEnrollment;
   screen_names_[SCREEN_OOBE_ENABLE_DEBUGGING] = kScreenOobeEnableDebugging;
   screen_names_[SCREEN_OOBE_RESET] = kScreenOobeReset;
   screen_names_[SCREEN_GAIA_SIGNIN] = kScreenGaiaSignin;
@@ skipping 112 matching lines @@
   DCHECK(screen_ids_.count(screen))
       << "Screen should be registered in InitializeScreenMaps()";
   Screen new_screen = screen_ids_[screen];
   FOR_EACH_OBSERVER(Observer,
                     observer_list_,
                     OnCurrentScreenChanged(current_screen_, new_screen));
   current_screen_ = new_screen;
 }
 
 }  // namespace chromeos