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

Unified Diff: chrome/browser/chromeos/login/screens/update_screen_browsertest.cc

Issue 2705363002: cros: Move BaseScreenDelegate::ExitCodes into separate file, ScreenExitCode. (Closed)
Patch Set: Rebase Created 3 years, 10 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/screens/update_screen_browsertest.cc
diff --git a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
index d44d751848cd23dd5f59333500a1d543ccbe01f6..0eff665908a3f5cc6766aa245d88508896f46abe 100644
--- a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
@@ -147,7 +147,8 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestNoUpdate) {
fake_update_engine_client_->set_default_status(status);
EXPECT_CALL(*mock_base_screen_delegate_,
- OnExit(_, BaseScreenDelegate::UPDATE_NOUPDATE, _)).Times(1);
+ OnExit(_, ScreenExitCode::UPDATE_NOUPDATE, _))
+ .Times(1);
update_screen_->UpdateStatusChanged(status);
}
@@ -190,14 +191,15 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestUpdateAvailable) {
IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorIssuingUpdateCheck) {
// First, cancel the update that is already in progress.
EXPECT_CALL(*mock_base_screen_delegate_,
- OnExit(_, BaseScreenDelegate::UPDATE_NOUPDATE, _)).Times(1);
+ OnExit(_, ScreenExitCode::UPDATE_NOUPDATE, _))
+ .Times(1);
update_screen_->CancelUpdate();
fake_update_engine_client_->set_update_check_result(
chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED);
EXPECT_CALL(*mock_base_screen_delegate_,
- OnExit(_, BaseScreenDelegate::UPDATE_ERROR_CHECKING_FOR_UPDATE,
- _)).Times(1);
+ OnExit(_, ScreenExitCode::UPDATE_ERROR_CHECKING_FOR_UPDATE, _))
+ .Times(1);
update_screen_->StartNetworkCheck();
}
@@ -209,8 +211,8 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorCheckingForUpdate) {
fake_update_engine_client_->set_default_status(status);
EXPECT_CALL(*mock_base_screen_delegate_,
- OnExit(_, BaseScreenDelegate::UPDATE_ERROR_CHECKING_FOR_UPDATE,
- _)).Times(1);
+ OnExit(_, ScreenExitCode::UPDATE_ERROR_CHECKING_FOR_UPDATE, _))
+ .Times(1);
update_screen_->UpdateStatusChanged(status);
}
@@ -230,13 +232,15 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorUpdating) {
fake_update_engine_client_->set_default_status(status);
EXPECT_CALL(*mock_base_screen_delegate_,
- OnExit(_, BaseScreenDelegate::UPDATE_ERROR_UPDATING, _)).Times(1);
+ OnExit(_, ScreenExitCode::UPDATE_ERROR_UPDATING, _))
+ .Times(1);
update_screen_->UpdateStatusChanged(status);
}
IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestTemproraryOfflineNetwork) {
EXPECT_CALL(*mock_base_screen_delegate_,
- OnExit(_, BaseScreenDelegate::UPDATE_NOUPDATE, _)).Times(1);
+ OnExit(_, ScreenExitCode::UPDATE_NOUPDATE, _))
+ .Times(1);
update_screen_->CancelUpdate();
// Change ethernet state to portal.
@@ -279,15 +283,16 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestTemproraryOfflineNetwork) {
chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED);
EXPECT_CALL(*mock_base_screen_delegate_,
- OnExit(_, BaseScreenDelegate::UPDATE_ERROR_CHECKING_FOR_UPDATE,
- _)).Times(1);
+ OnExit(_, ScreenExitCode::UPDATE_ERROR_CHECKING_FOR_UPDATE, _))
+ .Times(1);
NotifyPortalDetectionCompleted();
}
IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestTwoOfflineNetworks) {
EXPECT_CALL(*mock_base_screen_delegate_,
- OnExit(_, BaseScreenDelegate::UPDATE_NOUPDATE, _)).Times(1);
+ OnExit(_, ScreenExitCode::UPDATE_NOUPDATE, _))
+ .Times(1);
update_screen_->CancelUpdate();
// Change ethernet state to portal.
@@ -339,7 +344,8 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestVoidNetwork) {
// Cancels pending update request.
EXPECT_CALL(*mock_base_screen_delegate_,
- OnExit(_, BaseScreenDelegate::UPDATE_NOUPDATE, _)).Times(1);
+ OnExit(_, ScreenExitCode::UPDATE_NOUPDATE, _))
+ .Times(1);
update_screen_->CancelUpdate();
// First portal detection attempt returns NULL network and undefined
@@ -363,7 +369,8 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestVoidNetwork) {
IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestAPReselection) {
EXPECT_CALL(*mock_base_screen_delegate_,
- OnExit(_, BaseScreenDelegate::UPDATE_NOUPDATE, _)).Times(1);
+ OnExit(_, ScreenExitCode::UPDATE_NOUPDATE, _))
+ .Times(1);
update_screen_->CancelUpdate();
// Change ethernet state to portal.
@@ -401,8 +408,8 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestAPReselection) {
fake_update_engine_client_->set_update_check_result(
chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED);
EXPECT_CALL(*mock_base_screen_delegate_,
- OnExit(_, BaseScreenDelegate::UPDATE_ERROR_CHECKING_FOR_UPDATE,
- _)).Times(1);
+ OnExit(_, ScreenExitCode::UPDATE_ERROR_CHECKING_FOR_UPDATE, _))
+ .Times(1);
update_screen_->OnConnectRequested();
base::RunLoop().RunUntilIdle();
« no previous file with comments | « chrome/browser/chromeos/login/screens/update_screen.cc ('k') | chrome/browser/chromeos/login/screens/user_image_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698