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

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

Issue 10928088: Factory reset screen is added (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed formatting Created 8 years, 3 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
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 f6340700ccd64bc029290b00fd9f937fb23ca0dc..a31c00f51b2b445302fe5cb3ced6f6fb6dcf77f3 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -19,6 +19,7 @@
#include "chrome/browser/chromeos/login/mock_network_screen.h"
#include "chrome/browser/chromeos/login/mock_update_screen.h"
#include "chrome/browser/chromeos/login/network_screen.h"
+#include "chrome/browser/chromeos/login/reset_screen.h"
#include "chrome/browser/chromeos/login/user_image_screen.h"
#include "chrome/browser/chromeos/login/view_screen.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -305,9 +306,27 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,
MessageLoop::current()->RunAllPending();
}
+IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowResetScreen) {
+ EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
+ WizardController::default_controller()->current_screen());
+
+ BaseLoginDisplayHost::default_host()->StartSignInScreen();
+ EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
+ ExistingUserController::current_controller()->OnStartDeviceReset();
+
+ ResetScreen* screen =
+ WizardController::default_controller()->GetResetScreen();
+ EXPECT_EQ(screen, WizardController::default_controller()->current_screen());
+
+ // After reset screen is canceled, it returns to sign-in screen.
+ // And this destroys WizardController.
+ OnExit(ScreenObserver::RESET_CANCELED);
+ EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
+}
+
// TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571
-COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 13,
+COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 14,
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/browser/chromeos/settings/device_settings_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698