Move all typecasting code to individual screens.

chrome/browser/chromeos/login/wizard_controller.cc

Index: chrome/browser/chromeos/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index f9c9ed29b1146bcf6777494594111164e2c0d858..38ebfab99e7026e19d6d4ff4d7d13805e6756013 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -272,51 +272,10 @@ void WizardController::Init(
     ShowWrongHWIDScreen();
 }
 
-chromeos::NetworkScreen* WizardController::GetNetworkScreen() {
-  return static_cast<chromeos::NetworkScreen*>(GetScreen(kNetworkScreenName));
-}
-
-chromeos::UpdateScreen* WizardController::GetUpdateScreen() {
-  return static_cast<chromeos::UpdateScreen*>(GetScreen(kUpdateScreenName));
-}
-
-chromeos::UserImageScreen* WizardController::GetUserImageScreen() {
-  return static_cast<chromeos::UserImageScreen*>(
-      GetScreen(kUserImageScreenName));
-}
-
-chromeos::EnrollmentScreen* WizardController::GetEnrollmentScreen() {
-  return static_cast<chromeos::EnrollmentScreen*>(
-      GetScreen(kEnrollmentScreenName));
-}
-
-chromeos::AutoEnrollmentCheckScreen*
-    WizardController::GetAutoEnrollmentCheckScreen() {
-  return static_cast<chromeos::AutoEnrollmentCheckScreen*>(
-      GetScreen(kAutoEnrollmentCheckScreenName));
-}
-
-chromeos::SupervisedUserCreationScreen*
-    WizardController::GetSupervisedUserCreationScreen() {
-  return static_cast<chromeos::SupervisedUserCreationScreen*>(
-      GetScreen(kSupervisedUserCreationScreenName));
-}
-
 chromeos::ErrorScreen* WizardController::GetErrorScreen() {
   return static_cast<chromeos::ErrorScreen*>(GetScreen(kErrorScreenName));
 }
 
-WizardScreen* WizardController::GetScreen(const std::string& screen_name) {
-  ScreenMap::const_iterator iter = screens_.find(screen_name);
-  if (iter != screens_.end()) {
-    return iter->second.get();
-  }
-  WizardScreen* result = CreateScreen(screen_name);
-  DCHECK(result) << "Can not create screen named " << screen_name;
-  screens_[screen_name] = make_linked_ptr(result);
-  return result;
-}
-
 WizardScreen* WizardController::CreateScreen(const std::string& screen_name) {
   if (screen_name == kNetworkScreenName) {
     return new chromeos::NetworkScreen(this,
@@ -445,7 +404,7 @@ void WizardController::ShowEnrollmentScreen() {
 
   EnrollmentScreenActor::EnrollmentMode mode =
       EnrollmentScreenActor::ENROLLMENT_MODE_MANUAL;
-  EnrollmentScreen* screen = GetEnrollmentScreen();
+  EnrollmentScreen* screen = EnrollmentScreen::Get(this);
   std::string enrollment_domain = GetForcedEnrollmentDomain();
   if (is_auto_enrollment) {
     mode = EnrollmentScreenActor::ENROLLMENT_MODE_AUTO;
@@ -503,7 +462,7 @@ void WizardController::ShowWrongHWIDScreen() {
 void WizardController::ShowAutoEnrollmentCheckScreen() {
   VLOG(1) << "Showing Auto-enrollment check screen.";
   SetStatusAreaVisible(true);
-  AutoEnrollmentCheckScreen* screen = GetAutoEnrollmentCheckScreen();
+  AutoEnrollmentCheckScreen* screen = AutoEnrollmentCheckScreen::Get(this);
   screen->set_auto_enrollment_controller(host_->GetAutoEnrollmentController());
   SetCurrentScreen(screen);
 }
@@ -767,7 +726,7 @@ void WizardController::OnHostPairingFinished() {
 void WizardController::InitiateOOBEUpdate() {
   PerformPostEulaActions();
   SetCurrentScreenSmooth(GetScreen(kUpdateScreenName), true);
-  GetUpdateScreen()->StartNetworkCheck();
+  UpdateScreen::Get(this)->StartNetworkCheck();
 }
 
 void WizardController::StartTimezoneResolve() {