Move all typecasting code to individual screens.

chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.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 "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"
@@ skipping 19 matching lines @@
             WizardController::kEnrollmentScreenName) {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EnrollmentScreenTest);
 };
 
 IN_PROC_BROWSER_TEST_F(EnrollmentScreenTest, TestCancel) {
   ASSERT_TRUE(WizardController::default_controller() != NULL);
 
   EnrollmentScreen* enrollment_screen =
-      WizardController::default_controller()->GetEnrollmentScreen();
+      EnrollmentScreen::Get(WizardController::default_controller());
   ASSERT_TRUE(enrollment_screen != NULL);
 
   base::RunLoop run_loop;
   MockScreenObserver mock_screen_observer;
   static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
       &mock_screen_observer;
 
   ASSERT_EQ(WizardController::default_controller()->current_screen(),
             enrollment_screen);
 
   EXPECT_CALL(mock_screen_observer,
               OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED))
       .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
   enrollment_screen->OnCancel();
   content::RunThisRunLoop(&run_loop);
   Mock::VerifyAndClearExpectations(&mock_screen_observer);
 
   static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
       WizardController::default_controller();
 }
 
 // Flaky test: crbug.com/394069
 IN_PROC_BROWSER_TEST_F(EnrollmentScreenTest, DISABLED_TestSuccess) {
   ASSERT_TRUE(WizardController::default_controller() != NULL);
   EXPECT_FALSE(StartupUtils::IsOobeCompleted());
 
   EnrollmentScreen* enrollment_screen =
-      WizardController::default_controller()->GetEnrollmentScreen();
+      EnrollmentScreen::Get(WizardController::default_controller());
   ASSERT_TRUE(enrollment_screen != NULL);
 
   base::RunLoop run_loop;
   MockScreenObserver mock_screen_observer;
   static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
       &mock_screen_observer;
 
   ASSERT_EQ(WizardController::default_controller()->current_screen(),
             enrollment_screen);
 
@@ skipping 21 matching lines @@
         test_data_dir.AppendASCII("kiosk_manifest.json"));
   }
 
   DISALLOW_COPY_AND_ASSIGN(ProvisionedEnrollmentScreenTest);
 };
 
 IN_PROC_BROWSER_TEST_F(ProvisionedEnrollmentScreenTest, TestBackButton) {
   ASSERT_TRUE(WizardController::default_controller() != NULL);
 
   EnrollmentScreen* enrollment_screen =
-      WizardController::default_controller()->GetEnrollmentScreen();
+      EnrollmentScreen::Get(WizardController::default_controller());
   ASSERT_TRUE(enrollment_screen != NULL);
 
   base::RunLoop run_loop;
   MockScreenObserver mock_screen_observer;
   static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
       &mock_screen_observer;
 
   ASSERT_EQ(WizardController::default_controller()->current_screen(),
             enrollment_screen);
 
   EXPECT_CALL(mock_screen_observer,
               OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_BACK))
       .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
   enrollment_screen->OnCancel();
   content::RunThisRunLoop(&run_loop);
   Mock::VerifyAndClearExpectations(&mock_screen_observer);
 
   static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
       WizardController::default_controller();
 }
 
 }  // namespace chromeos