Swap EULA and update screens in OOBE process.

BUG=http://crosbug.com/5376
TEST=Manual

Review URL: http://codereview.chromium.org/3114011/show


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56339 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 26 insertions, 17 deletions

diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 75bde1d..3434554 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -488,8 +488,7 @@ void WizardController::OnLoginCreateAccount() {
 
 void WizardController::OnNetworkConnected() {
   if (is_official_build_) {
-    ShowUpdateScreen();
-    GetUpdateScreen()->StartUpdate();
+    ShowEulaScreen();
   } else {
     OnOOBECompleted();
   }
@@ -537,11 +536,12 @@ void WizardController::OnConnectionFailed() {
 }
 
 void WizardController::OnUpdateCompleted() {
-  ShowEulaScreen();
+  OnOOBECompleted();
 }
 
 void WizardController::OnEulaAccepted() {
-  OnOOBECompleted();
+  ShowUpdateScreen();
+  GetUpdateScreen()->StartUpdate();
 }
 
 void WizardController::OnUpdateErrorCheckingForUpdate() {
@@ -550,7 +550,7 @@ void WizardController::OnUpdateErrorCheckingForUpdate() {
   // screen if there is any error checking for an update.
   // They could use "browse without sign-in" feature to set up the network to be
   // able to perform the update later.
-  ShowEulaScreen();
+  OnOOBECompleted();
 }
 
 void WizardController::OnUpdateErrorUpdating() {
@@ -559,7 +559,7 @@ void WizardController::OnUpdateErrorUpdating() {
   // TODO(nkostylev): Show message to the user explaining update error.
   // TODO(nkostylev): Update should be required during OOBE.
   // Temporary fix, need to migrate to new API. http://crosbug.com/4321
-  ShowEulaScreen();
+  OnOOBECompleted();
 }
 
 void WizardController::OnUserImageSelected() {
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index e8a0f02..1fa0261 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -136,19 +136,20 @@ class WizardControllerFlowTest : public WizardControllerTest {
 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowMain) {
   EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen());
   EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
+  EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
+  controller()->OnExit(chromeos::ScreenObserver::NETWORK_CONNECTED);
+
+  EXPECT_EQ(controller()->GetEulaScreen(), controller()->current_screen());
+  EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
   EXPECT_CALL(*mock_update_screen_, StartUpdate()).Times(1);
   EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
-  controller()->OnExit(chromeos::ScreenObserver::NETWORK_CONNECTED);
+  controller()->OnExit(chromeos::ScreenObserver::EULA_ACCEPTED);
 
   EXPECT_EQ(controller()->GetUpdateScreen(), controller()->current_screen());
   EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
-  EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
-  controller()->OnExit(chromeos::ScreenObserver::UPDATE_INSTALLED);
-
-  EXPECT_EQ(controller()->GetEulaScreen(), controller()->current_screen());
-  EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
+  EXPECT_CALL(*mock_eula_screen_, Show()).Times(0);
   EXPECT_CALL(*mock_login_screen_, Show()).Times(1);
-  controller()->OnExit(chromeos::ScreenObserver::EULA_ACCEPTED);
+  controller()->OnExit(chromeos::ScreenObserver::UPDATE_INSTALLED);
 
   EXPECT_EQ(controller()->GetLoginScreen(), controller()->current_screen());
   EXPECT_CALL(*mock_login_screen_, Hide()).Times(1);
@@ -166,19 +167,27 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowMain) {
 
 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorUpdate) {
   EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen());
-  EXPECT_CALL(*mock_update_screen_, StartUpdate()).Times(1);
-  EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
+  EXPECT_CALL(*mock_update_screen_, StartUpdate()).Times(0);
+  EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
+  EXPECT_CALL(*mock_update_screen_, Show()).Times(0);
   EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
   controller()->OnExit(chromeos::ScreenObserver::NETWORK_CONNECTED);
 
+  EXPECT_EQ(controller()->GetEulaScreen(), controller()->current_screen());
+  EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
+  EXPECT_CALL(*mock_update_screen_, StartUpdate()).Times(1);
+  EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
+  controller()->OnExit(chromeos::ScreenObserver::EULA_ACCEPTED);
+
   EXPECT_EQ(controller()->GetUpdateScreen(), controller()->current_screen());
   EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
-  EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
+  EXPECT_CALL(*mock_eula_screen_, Show()).Times(0);
   EXPECT_CALL(*mock_eula_screen_, Hide()).Times(0);  // last transition
+  EXPECT_CALL(*mock_login_screen_, Show()).Times(1);
   controller()->OnExit(
       chromeos::ScreenObserver::UPDATE_ERROR_UPDATING);
 
-  EXPECT_EQ(controller()->GetEulaScreen(), controller()->current_screen());
+  EXPECT_EQ(controller()->GetLoginScreen(), controller()->current_screen());
 }
 
 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorNetwork) {