Merge WebUILoginDisplayHost into LoginDisplayHostImpl

chrome/browser/chromeos/login/existing_user_controller_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 <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 339 matching lines @@
               DoBrowserLaunch(testing_profile_.get(),
                               mock_login_display_host_.get()))
       .Times(1);
   EXPECT_CALL(*mock_login_display_, OnLoginSuccess(kUsername))
       .Times(1);
   EXPECT_CALL(*mock_login_display_, SetUIEnabled(true))
       .Times(1);
   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())
       .WillRepeatedly(Return(false));
   existing_user_controller()->Login(UserContext(kUsername, kPassword, ""));
   content::RunAllPendingInMessageLoop();
 }
 
 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);
   EXPECT_CALL(*mock_login_display_host_.get(), OnCompleteLogin())
       .Times(1);
   EXPECT_CALL(*mock_user_manager_->user_manager(), IsCurrentUserNew())
       .Times(AnyNumber())
       .WillRepeatedly(Return(false));
   // The order of these expected calls matters: the UI if first disabled
   // during the login sequence, and is enabled again for the enrollment screen.
   Sequence uiEnabledSequence;
   EXPECT_CALL(*mock_login_display_, SetUIEnabled(false))
       .Times(1)
       .InSequence(uiEnabledSequence);
   EXPECT_CALL(*mock_login_display_, SetUIEnabled(true))
       .Times(1)
       .InSequence(uiEnabledSequence);
   existing_user_controller()->DoAutoEnrollment();
   existing_user_controller()->CompleteLogin(
       UserContext(kUsername, kPassword, ""));
   content::RunAllPendingInMessageLoop();
 }
 
 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)
       .WillOnce(WithArg<0>(Invoke(CreateAuthenticatorNewUser)));
   EXPECT_CALL(*mock_login_utils_,
               PrepareProfile(UserContext(kNewUsername,
                                          kPassword,
                                          std::string(),
                                          kNewUsername),
                              _, _, _, _))
@@ skipping 135 matching lines @@
                 DoBrowserLaunch(testing_profile_.get(),
                                 mock_login_display_host_.get()))
         .Times(1);
     EXPECT_CALL(*mock_login_display_, OnLoginSuccess(username))
         .Times(1);
     EXPECT_CALL(*mock_login_display_, SetUIEnabled(true))
         .Times(1);
     EXPECT_CALL(*mock_login_display_, OnFadeOut())
         .Times(1);
     EXPECT_CALL(*mock_login_display_host_,
-                StartWizard(WizardController::kTermsOfServiceScreenName, NULL))
+                StartWizardPtr(WizardController::kTermsOfServiceScreenName,
+                               NULL))
         .Times(0);
   }
 
   scoped_ptr<base::RunLoop> CreateSettingsObserverRunLoop(
       content::MockNotificationObserver& observer, const char* setting) {
     base::RunLoop* loop = new base::RunLoop;
     EXPECT_CALL(observer, Observe(chrome::NOTIFICATION_SYSTEM_SETTING_CHANGED,
                                   _, HasDetails(setting)))
         .Times(1)
         .WillOnce(InvokeWithoutArgs(loop, &base::RunLoop::Quit));
@@ skipping 234 matching lines @@
 
   // Wait for login tasks to complete.
   content::RunAllPendingInMessageLoop();
 
   // Timer should still be stopped after login completes.
   ASSERT_TRUE(auto_login_timer());
   EXPECT_FALSE(auto_login_timer()->IsRunning());
 }
 
 }  // namespace chromeos