cros: ensure update check to complete at OOBE before allowing login

chrome/browser/chromeos/login/wizard_controller.cc

Index: chrome/browser/chromeos/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index ffdc6e4eebda0dd2ce23743d62a2e6863f410c0e..2026e817eddd95bad8fbafc003cce99958d29fd3 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -732,12 +732,21 @@ void WizardController::OnChangedMetricsReportingState(bool enabled) {
 }
 
 void WizardController::OnUpdateErrorCheckingForUpdate() {
-  // TODO(nkostylev): Update should be required during OOBE.
-  // We do not want to block users from being able to proceed to the login
-  // 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.
-  OnUpdateCompleted();
+  bool is_hands_off_mode =

[achuithb, 2017/02/14 09:05:25]

nit const

[Ben Chan, 2017/02/14 18:31:11]

Done.

+      (policy::DeviceCloudPolicyManagerChromeOS::GetZeroTouchEnrollmentMode() ==
+       policy::ZeroTouchEnrollmentMode::HANDS_OFF);
+
+  // If there was an error while checking for update, return to the network
+  // selection screen if the OOBE isn't complete (unless it's in the zero-touch
+  // enrollment mode)  as we don't want to miss any critical update. Otherwise,
+  // we do not want to block users from being able to proceed to the login
+  // 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.
+  if (is_out_of_box_ && !is_hands_off_mode)

[achuithb, 2017/02/14 09:05:25]

Is hands off mode behavior covered by browser tests?

[Ben Chan, 2017/02/14 18:31:11]

It's indirectly covered by those HandsOff*Test tests (which was initially broken
by this change). I'll evaluate if additional tests should be added in a
follow-up CL.

+    ShowNetworkScreen();
+  else
+    OnUpdateCompleted();
 }
 
 void WizardController::OnUpdateErrorUpdating(bool is_critical_update) {