#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"
+#include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "chrome/test/base/ui_test_utils.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/chromeos_test_utils.h"
#include "content/public/test/test_utils.h"
ASSERT_TRUE(enrollment_screen != NULL);
base::RunLoop run_loop;
- MockScreenObserver mock_screen_observer;
- static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
- &mock_screen_observer;
+ MockBaseScreenDelegate mock_base_screen_delegate;
+ static_cast<BaseScreen*>(enrollment_screen)->base_screen_delegate_ =
+ &mock_base_screen_delegate;
ASSERT_EQ(WizardController::default_controller()->current_screen(),
enrollment_screen);
- EXPECT_CALL(mock_screen_observer,
- OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED))
+ EXPECT_CALL(mock_base_screen_delegate,
+ OnExit(BaseScreenDelegate::ENTERPRISE_ENROLLMENT_COMPLETED))
.WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
enrollment_screen->OnCancel();
content::RunThisRunLoop(&run_loop);
- Mock::VerifyAndClearExpectations(&mock_screen_observer);
+ Mock::VerifyAndClearExpectations(&mock_base_screen_delegate);
- static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
+ static_cast<BaseScreen*>(enrollment_screen)->base_screen_delegate_ =
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;
+ MockBaseScreenDelegate mock_base_screen_delegate;
+ static_cast<BaseScreen*>(enrollment_screen)->base_screen_delegate_ =
+ &mock_base_screen_delegate;
ASSERT_EQ(WizardController::default_controller()->current_screen(),
enrollment_screen);
run_loop.RunUntilIdle();
EXPECT_TRUE(StartupUtils::IsOobeCompleted());
- static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
+ static_cast<BaseScreen*>(enrollment_screen)->base_screen_delegate_ =
WizardController::default_controller();
}
private:
// Overridden from InProcessBrowserTest:
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) override {
base::FilePath test_data_dir;
ASSERT_TRUE(chromeos::test_utils::GetTestDataPath(
"app_mode", "kiosk_manifest", &test_data_dir));
ASSERT_TRUE(enrollment_screen != NULL);
base::RunLoop run_loop;
- MockScreenObserver mock_screen_observer;
- static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
- &mock_screen_observer;
+ MockBaseScreenDelegate mock_base_screen_delegate;
+ static_cast<BaseScreen*>(enrollment_screen)->base_screen_delegate_ =
+ &mock_base_screen_delegate;
ASSERT_EQ(WizardController::default_controller()->current_screen(),
enrollment_screen);
- EXPECT_CALL(mock_screen_observer,
- OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_BACK))
+ EXPECT_CALL(mock_base_screen_delegate,
+ OnExit(BaseScreenDelegate::ENTERPRISE_ENROLLMENT_BACK))
.WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
enrollment_screen->OnCancel();
content::RunThisRunLoop(&run_loop);
- Mock::VerifyAndClearExpectations(&mock_screen_observer);
+ Mock::VerifyAndClearExpectations(&mock_base_screen_delegate);
- static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
+ static_cast<BaseScreen*>(enrollment_screen)->base_screen_delegate_ =
WizardController::default_controller();
}