Merge WebUILoginDisplayHost into LoginDisplayHostImpl

chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

Index: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
index 8d06a0d86d10d40aa3733759e2c86a716c8a63bd..d10f2f66b3806e61dbc33026e614f24d63b5d9af 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -357,7 +357,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, ExistingUserLogin) {
   EXPECT_CALL(*mock_login_display_, OnFadeOut())
       .Times(1);
   EXPECT_CALL(*mock_login_display_host_,
-              StartWizard(WizardController::kTermsOfServiceScreenName, NULL))
+              StartWizardPtr(WizardController::kTermsOfServiceScreenName, NULL))
       .Times(0);
   EXPECT_CALL(*mock_user_manager_->user_manager(), IsCurrentUserNew())
       .Times(AnyNumber())
@@ -368,7 +368,8 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, ExistingUserLogin) {
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, AutoEnrollAfterSignIn) {
   EXPECT_CALL(*mock_login_display_host_,
-              StartWizard(WizardController::kEnterpriseEnrollmentScreenName, _))
+              StartWizardPtr(WizardController::kEnterpriseEnrollmentScreenName,
+                             _))
       .Times(1);
   EXPECT_CALL(*mock_login_display_, OnFadeOut())
       .Times(1);
@@ -395,10 +396,12 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, AutoEnrollAfterSignIn) {
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest,
                        NewUserDontAutoEnrollAfterSignIn) {
   EXPECT_CALL(*mock_login_display_host_,
-              StartWizard(WizardController::kEnterpriseEnrollmentScreenName, _))
+              StartWizardPtr(WizardController::kEnterpriseEnrollmentScreenName,
+                             _))
       .Times(0);
   EXPECT_CALL(*mock_login_display_host_,
-              StartWizard(WizardController::kTermsOfServiceScreenName, NULL))
+              StartWizardPtr(WizardController::kTermsOfServiceScreenName,
+                             NULL))
       .Times(1);
   EXPECT_CALL(*mock_login_utils_, CreateAuthenticator(_))
       .Times(1)
@@ -554,7 +557,8 @@ class ExistingUserControllerPublicSessionTest
     EXPECT_CALL(*mock_login_display_, OnFadeOut())
         .Times(1);
     EXPECT_CALL(*mock_login_display_host_,
-                StartWizard(WizardController::kTermsOfServiceScreenName, NULL))
+                StartWizardPtr(WizardController::kTermsOfServiceScreenName,
+                               NULL))
         .Times(0);
   }