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

Unified Diff: chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc

Issue 647043004: WizardScreen is merged to BaseScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: 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
Index: chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc
index 36af5f801d30cbe282bcae72c31723d83827c011..92f259dee04c95082e9596fd4f27331124563732 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc
@@ -42,7 +42,7 @@ IN_PROC_BROWSER_TEST_F(EnrollmentScreenTest, TestCancel) {
base::RunLoop run_loop;
MockScreenObserver mock_screen_observer;
- static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
+ static_cast<BaseScreen*>(enrollment_screen)->screen_observer_ =
&mock_screen_observer;
ASSERT_EQ(WizardController::default_controller()->current_screen(),
@@ -55,7 +55,7 @@ IN_PROC_BROWSER_TEST_F(EnrollmentScreenTest, TestCancel) {
content::RunThisRunLoop(&run_loop);
Mock::VerifyAndClearExpectations(&mock_screen_observer);
- static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
+ static_cast<BaseScreen*>(enrollment_screen)->screen_observer_ =
WizardController::default_controller();
}
@@ -70,7 +70,7 @@ IN_PROC_BROWSER_TEST_F(EnrollmentScreenTest, DISABLED_TestSuccess) {
base::RunLoop run_loop;
MockScreenObserver mock_screen_observer;
- static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
+ static_cast<BaseScreen*>(enrollment_screen)->screen_observer_ =
&mock_screen_observer;
ASSERT_EQ(WizardController::default_controller()->current_screen(),
@@ -81,7 +81,7 @@ IN_PROC_BROWSER_TEST_F(EnrollmentScreenTest, DISABLED_TestSuccess) {
run_loop.RunUntilIdle();
EXPECT_TRUE(StartupUtils::IsOobeCompleted());
- static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
+ static_cast<BaseScreen*>(enrollment_screen)->screen_observer_ =
WizardController::default_controller();
}
@@ -112,7 +112,7 @@ IN_PROC_BROWSER_TEST_F(ProvisionedEnrollmentScreenTest, TestBackButton) {
base::RunLoop run_loop;
MockScreenObserver mock_screen_observer;
- static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
+ static_cast<BaseScreen*>(enrollment_screen)->screen_observer_ =
&mock_screen_observer;
ASSERT_EQ(WizardController::default_controller()->current_screen(),
@@ -125,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(ProvisionedEnrollmentScreenTest, TestBackButton) {
content::RunThisRunLoop(&run_loop);
Mock::VerifyAndClearExpectations(&mock_screen_observer);
- static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
+ static_cast<BaseScreen*>(enrollment_screen)->screen_observer_ =
WizardController::default_controller();
}
« no previous file with comments | « chrome/browser/chromeos/login/enrollment/enrollment_screen.cc ('k') | chrome/browser/chromeos/login/screen_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698