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

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ skipping 714 matching lines @@
     return;
 #if defined(GOOGLE_CHROME_BUILD)
   if (!content::BrowserThread::PostBlockingPoolTask(
           FROM_HERE, base::Bind(&InitializeCrashReporter))) {
     LOG(ERROR) << "Failed to start crash reporter initialization.";
   }
 #endif
 }
 
 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) {
   // If there was an error while getting or applying the update, return to
   // network selection screen if the OOBE isn't complete and the update is
   // deemed critical. Otherwise, similar to OnUpdateErrorCheckingForUpdate(),
   // we do not want to block users from being able to proceed to the login
   // screen.
   if (is_out_of_box_ && is_critical_update)
     ShowNetworkScreen();
@@ skipping 756 matching lines @@
             : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
   }
 
   EnrollmentScreen* screen = EnrollmentScreen::Get(this);
   screen->SetParameters(effective_config, shark_controller_.get());
   SetStatusAreaVisible(true);
   SetCurrentScreen(screen);
 }
 
 }  // namespace chromeos