Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1784)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/wizard_controller_browsertest.cc

Issue 679133002: ScreenObserver is renamed to BaseScreenDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/wizard_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index cb09d208652ff0aec5f76aca3e4477e5e1321b88..7b8dc6aec41d0c0c868e523372e1a4e9ad306eb2 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -240,8 +240,8 @@ class WizardControllerTest : public WizardInProcessBrowserTest {
}
ErrorScreen* GetErrorScreen() {
- return static_cast<ScreenObserver*>(WizardController::default_controller())
- ->GetErrorScreen();
+ return static_cast<BaseScreenDelegate*>(
+ WizardController::default_controller())->GetErrorScreen();
}
content::WebContents* GetWebContents() {
@@ -475,7 +475,7 @@ class WizardControllerFlowTest : public WizardControllerTest {
online_state);
}
- void OnExit(ScreenObserver::ExitCodes exit_code) {
+ void OnExit(BaseScreenDelegate::ExitCodes exit_code) {
WizardController::default_controller()->OnExit(exit_code);
}
@@ -531,7 +531,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowMain) {
EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
- OnExit(ScreenObserver::NETWORK_CONNECTED);
+ OnExit(BaseScreenDelegate::NETWORK_CONNECTED);
CheckCurrentScreen(WizardController::kEulaScreenName);
@@ -543,7 +543,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowMain) {
EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
// Enable TimeZone resolve
InitTimezoneResolver();
- OnExit(ScreenObserver::EULA_ACCEPTED);
+ OnExit(BaseScreenDelegate::EULA_ACCEPTED);
EXPECT_TRUE(GetGeolocationProvider());
// Let update screen smooth time process (time = 0ms).
@@ -552,12 +552,12 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowMain) {
CheckCurrentScreen(WizardController::kUpdateScreenName);
EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
- OnExit(ScreenObserver::UPDATE_INSTALLED);
+ OnExit(BaseScreenDelegate::UPDATE_INSTALLED);
CheckCurrentScreen(WizardController::kAutoEnrollmentCheckScreenName);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(0);
- OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
+ OnExit(BaseScreenDelegate::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
EXPECT_EQ("ethernet,wifi,cellular",
@@ -576,13 +576,13 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorUpdate) {
EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
EXPECT_CALL(*mock_update_screen_, Show()).Times(0);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
- OnExit(ScreenObserver::NETWORK_CONNECTED);
+ OnExit(BaseScreenDelegate::NETWORK_CONNECTED);
CheckCurrentScreen(WizardController::kEulaScreenName);
EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
- OnExit(ScreenObserver::EULA_ACCEPTED);
+ OnExit(BaseScreenDelegate::EULA_ACCEPTED);
// Let update screen smooth time process (time = 0ms).
content::RunAllPendingInMessageLoop();
@@ -590,12 +590,12 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorUpdate) {
CheckCurrentScreen(WizardController::kUpdateScreenName);
EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
- OnExit(ScreenObserver::UPDATE_ERROR_UPDATING);
+ OnExit(BaseScreenDelegate::UPDATE_ERROR_UPDATING);
CheckCurrentScreen(WizardController::kAutoEnrollmentCheckScreenName);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(0);
- OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
+ OnExit(BaseScreenDelegate::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
}
@@ -606,7 +606,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowSkipUpdateEnroll) {
EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
EXPECT_CALL(*mock_update_screen_, Show()).Times(0);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
- OnExit(ScreenObserver::NETWORK_CONNECTED);
+ OnExit(BaseScreenDelegate::NETWORK_CONNECTED);
CheckCurrentScreen(WizardController::kEulaScreenName);
EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
@@ -619,14 +619,14 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowSkipUpdateEnroll) {
""))
.Times(1);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
- OnExit(ScreenObserver::EULA_ACCEPTED);
+ OnExit(BaseScreenDelegate::EULA_ACCEPTED);
content::RunAllPendingInMessageLoop();
CheckCurrentScreen(WizardController::kAutoEnrollmentCheckScreenName);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1);
EXPECT_CALL(*mock_enrollment_screen_, Hide()).Times(0);
- OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
+ OnExit(BaseScreenDelegate::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
content::RunAllPendingInMessageLoop();
CheckCurrentScreen(WizardController::kEnrollmentScreenName);
@@ -641,13 +641,13 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowEulaDeclined) {
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(0);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
- OnExit(ScreenObserver::NETWORK_CONNECTED);
+ OnExit(BaseScreenDelegate::NETWORK_CONNECTED);
CheckCurrentScreen(WizardController::kEulaScreenName);
EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_network_screen_, Show()).Times(1);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(0); // last transition
- OnExit(ScreenObserver::EULA_BACK);
+ OnExit(BaseScreenDelegate::EULA_BACK);
CheckCurrentScreen(WizardController::kNetworkScreenName);
}
@@ -667,7 +667,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,
WizardController::default_controller()->AdvanceToScreen(
WizardController::kEnrollmentScreenName);
CheckCurrentScreen(WizardController::kEnrollmentScreenName);
- OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED);
+ OnExit(BaseScreenDelegate::ENTERPRISE_ENROLLMENT_COMPLETED);
EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
}
@@ -699,7 +699,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,
CheckCurrentScreen(WizardController::kEnrollmentScreenName);
// This is the main expectation: after auto-enrollment, login is resumed.
EXPECT_CALL(mock_consumer, OnAuthSuccess(_)).Times(1);
- OnExit(ScreenObserver::ENTERPRISE_AUTO_MAGIC_ENROLLMENT_COMPLETED);
+ OnExit(BaseScreenDelegate::ENTERPRISE_AUTO_MAGIC_ENROLLMENT_COMPLETED);
// Prevent browser launch when the profile is prepared:
browser_shutdown::SetTryingToQuit(true);
// Run the tasks posted to complete the login:
@@ -718,7 +718,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,
// After warning is skipped, user returns to sign-in screen.
// And this destroys WizardController.
- OnExit(ScreenObserver::WRONG_HWID_WARNING_SKIPPED);
+ OnExit(BaseScreenDelegate::WRONG_HWID_WARNING_SKIPPED);
EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
}
@@ -759,13 +759,13 @@ IN_PROC_BROWSER_TEST_F(WizardControllerDeviceStateTest,
CheckCurrentScreen(WizardController::kNetworkScreenName);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
- OnExit(ScreenObserver::NETWORK_CONNECTED);
+ OnExit(BaseScreenDelegate::NETWORK_CONNECTED);
CheckCurrentScreen(WizardController::kEulaScreenName);
EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
- OnExit(ScreenObserver::EULA_ACCEPTED);
+ OnExit(BaseScreenDelegate::EULA_ACCEPTED);
// Let update screen smooth time process (time = 0ms).
content::RunAllPendingInMessageLoop();
@@ -773,7 +773,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerDeviceStateTest,
CheckCurrentScreen(WizardController::kUpdateScreenName);
EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
- OnExit(ScreenObserver::UPDATE_INSTALLED);
+ OnExit(BaseScreenDelegate::UPDATE_INSTALLED);
AutoEnrollmentCheckScreen* screen =
AutoEnrollmentCheckScreen::Get(WizardController::default_controller());
@@ -799,13 +799,13 @@ IN_PROC_BROWSER_TEST_F(WizardControllerDeviceStateTest,
SetParameters(mock_enrollment_screen_,
EnrollmentScreenActor::ENROLLMENT_MODE_FORCED,
"")).Times(1);
- OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
+ OnExit(BaseScreenDelegate::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
ResetAutoEnrollmentCheckScreen();
// Make sure enterprise enrollment page shows up.
CheckCurrentScreen(WizardController::kEnrollmentScreenName);
- OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED);
+ OnExit(BaseScreenDelegate::ENTERPRISE_ENROLLMENT_COMPLETED);
EXPECT_TRUE(StartupUtils::IsOobeCompleted());
}
@@ -821,13 +821,13 @@ IN_PROC_BROWSER_TEST_F(WizardControllerDeviceStateTest,
CheckCurrentScreen(WizardController::kNetworkScreenName);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
- OnExit(ScreenObserver::NETWORK_CONNECTED);
+ OnExit(BaseScreenDelegate::NETWORK_CONNECTED);
CheckCurrentScreen(WizardController::kEulaScreenName);
EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
- OnExit(ScreenObserver::EULA_ACCEPTED);
+ OnExit(BaseScreenDelegate::EULA_ACCEPTED);
// Let update screen smooth time process (time = 0ms).
content::RunAllPendingInMessageLoop();
@@ -835,7 +835,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerDeviceStateTest,
CheckCurrentScreen(WizardController::kUpdateScreenName);
EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
- OnExit(ScreenObserver::UPDATE_INSTALLED);
+ OnExit(BaseScreenDelegate::UPDATE_INSTALLED);
AutoEnrollmentCheckScreen* screen =
AutoEnrollmentCheckScreen::Get(WizardController::default_controller());
@@ -854,13 +854,13 @@ IN_PROC_BROWSER_TEST_F(WizardControllerDeviceStateTest,
CheckCurrentScreen(WizardController::kNetworkScreenName);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
- OnExit(ScreenObserver::NETWORK_CONNECTED);
+ OnExit(BaseScreenDelegate::NETWORK_CONNECTED);
CheckCurrentScreen(WizardController::kEulaScreenName);
EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
- OnExit(ScreenObserver::EULA_ACCEPTED);
+ OnExit(BaseScreenDelegate::EULA_ACCEPTED);
// Let update screen smooth time process (time = 0ms).
content::RunAllPendingInMessageLoop();
@@ -868,7 +868,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerDeviceStateTest,
CheckCurrentScreen(WizardController::kUpdateScreenName);
EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
- OnExit(ScreenObserver::UPDATE_INSTALLED);
+ OnExit(BaseScreenDelegate::UPDATE_INSTALLED);
AutoEnrollmentCheckScreen* screen =
AutoEnrollmentCheckScreen::Get(WizardController::default_controller());
@@ -890,7 +890,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerDeviceStateTest,
g_browser_process->local_state()->Set(prefs::kServerBackedDeviceState,
device_state);
EXPECT_CALL(*device_disabled_screen_actor_, Show(kDisabledMessage)).Times(1);
- OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
+ OnExit(BaseScreenDelegate::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
ResetAutoEnrollmentCheckScreen();
@@ -1041,13 +1041,13 @@ IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest,
CheckCurrentScreen(WizardController::kNetworkScreenName);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
- OnExit(ScreenObserver::NETWORK_CONNECTED);
+ OnExit(BaseScreenDelegate::NETWORK_CONNECTED);
CheckCurrentScreen(WizardController::kEulaScreenName);
EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
- OnExit(ScreenObserver::EULA_ACCEPTED);
+ OnExit(BaseScreenDelegate::EULA_ACCEPTED);
// Let update screen smooth time process (time = 0ms).
content::RunAllPendingInMessageLoop();
@@ -1055,19 +1055,18 @@ IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest,
CheckCurrentScreen(WizardController::kUpdateScreenName);
EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
- OnExit(ScreenObserver::UPDATE_INSTALLED);
+ OnExit(BaseScreenDelegate::UPDATE_INSTALLED);
CheckCurrentScreen(WizardController::kAutoEnrollmentCheckScreenName);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1);
- OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
-
+ OnExit(BaseScreenDelegate::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
EXPECT_FALSE(StartupUtils::IsOobeCompleted());
// Make sure enterprise enrollment page shows up right after update screen.
CheckCurrentScreen(WizardController::kEnrollmentScreenName);
- OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED);
+ OnExit(BaseScreenDelegate::ENTERPRISE_ENROLLMENT_COMPLETED);
EXPECT_TRUE(StartupUtils::IsOobeCompleted());
}
@@ -1086,13 +1085,13 @@ IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest,
EXPECT_CALL(*mock_network_screen_, Show()).Times(1);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
- OnExit(ScreenObserver::NETWORK_CONNECTED);
+ OnExit(BaseScreenDelegate::NETWORK_CONNECTED);
CheckCurrentScreen(WizardController::kEulaScreenName);
EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
- OnExit(ScreenObserver::EULA_ACCEPTED);
+ OnExit(BaseScreenDelegate::EULA_ACCEPTED);
// Let update screen smooth time process (time = 0ms).
content::RunAllPendingInMessageLoop();
@@ -1100,19 +1099,19 @@ IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest,
CheckCurrentScreen(WizardController::kUpdateScreenName);
EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
- OnExit(ScreenObserver::UPDATE_INSTALLED);
+ OnExit(BaseScreenDelegate::UPDATE_INSTALLED);
CheckCurrentScreen(WizardController::kAutoEnrollmentCheckScreenName);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1);
EXPECT_CALL(*mock_enrollment_screen_, Hide()).Times(1);
- OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
+ OnExit(BaseScreenDelegate::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
EXPECT_FALSE(StartupUtils::IsOobeCompleted());
// Make sure enterprise enrollment page shows up right after update screen.
CheckCurrentScreen(WizardController::kEnrollmentScreenName);
- OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_BACK);
+ OnExit(BaseScreenDelegate::ENTERPRISE_ENROLLMENT_BACK);
CheckCurrentScreen(WizardController::kNetworkScreenName);
EXPECT_FALSE(StartupUtils::IsOobeCompleted());
@@ -1142,7 +1141,7 @@ class WizardControllerOobeResumeTest : public WizardControllerTest {
MockEnrollmentScreenActor);
}
- void OnExit(ScreenObserver::ExitCodes exit_code) {
+ void OnExit(BaseScreenDelegate::ExitCodes exit_code) {
WizardController::default_controller()->OnExit(exit_code);
}
@@ -1193,7 +1192,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerOobeResumeTest,
// TODO(dzhioev): Add tests for controller/host pairing flow.
// http://crbug.com/375191
-COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 24,
+COMPILE_ASSERT(BaseScreenDelegate::EXIT_CODES_COUNT == 24,
add_tests_for_new_control_flow_you_just_introduced);
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698