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

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

Issue 692383005: Add DeviceDisablingManager to manage device disabling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@f_3_425574_disable_header_bar
Patch Set: Move the parsing of the disabled message to DeviceDisablingManager as well. Created 6 years, 1 month 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
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 3865b8ee42a2fec339ce567b86793f29d950d47b..011af0ed61a3fdb901dffc994ed3614c34377031 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -554,7 +554,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowMain) {
OnExit(BaseScreenDelegate::UPDATE_INSTALLED);
CheckCurrentScreen(WizardController::kAutoEnrollmentCheckScreenName);
- EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1);
+ EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(0);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(0);
OnExit(BaseScreenDelegate::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
@@ -592,7 +592,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorUpdate) {
OnExit(BaseScreenDelegate::UPDATE_ERROR_UPDATING);
CheckCurrentScreen(WizardController::kAutoEnrollmentCheckScreenName);
- EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1);
+ EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(0);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(0);
OnExit(BaseScreenDelegate::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
@@ -840,7 +840,6 @@ IN_PROC_BROWSER_TEST_F(WizardControllerDeviceStateTest,
AutoEnrollmentCheckScreen::Get(WizardController::default_controller());
EXPECT_EQ(screen,
WizardController::default_controller()->current_screen());
- EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1);
screen->Start();
EXPECT_EQ(policy::AUTO_ENROLLMENT_STATE_NO_ENROLLMENT,
LoginDisplayHostImpl::default_host()
@@ -1192,7 +1191,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerOobeResumeTest,
// TODO(dzhioev): Add tests for controller/host pairing flow.
// http://crbug.com/375191
-COMPILE_ASSERT(BaseScreenDelegate::EXIT_CODES_COUNT == 24,
+COMPILE_ASSERT(BaseScreenDelegate::EXIT_CODES_COUNT == 23,
add_tests_for_new_control_flow_you_just_introduced);
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698