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

chrome/browser/chromeos/login/wizard_controller_browsertest.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 "ash/common/accessibility_types.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ skipping 574 matching lines @@
   EXPECT_EQ("ethernet,wifi,cellular",
             NetworkHandler::Get()->network_state_handler()
             ->GetCheckPortalListForTest());
 
   WaitUntilTimezoneResolved();
   EXPECT_EQ("America/Anchorage",
             base::UTF16ToUTF8(chromeos::system::TimezoneSettings::GetInstance()
                                   ->GetCurrentTimezoneID()));
 }
 
-// This test verifies that if WizardController fails to check for update before
-// the OOBE is marked complete, it goes back the network selection screen and
-// thus prevents the user from proceeding to log in.
-IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,
-                       ControlFlowErrorCheckingForUpdate) {
-  CheckCurrentScreen(OobeScreen::SCREEN_OOBE_NETWORK);
-  EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).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);
-  OnExit(*mock_network_screen_, BaseScreenDelegate::NETWORK_CONNECTED);
-
-  CheckCurrentScreen(OobeScreen::SCREEN_OOBE_EULA);
-  EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
-  EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
-  EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
-  OnExit(*mock_eula_screen_, BaseScreenDelegate::EULA_ACCEPTED);
-
-  // Let update screen smooth time process (time = 0ms).
-  content::RunAllPendingInMessageLoop();
-
-  CheckCurrentScreen(OobeScreen::SCREEN_OOBE_UPDATE);
-  EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
-  EXPECT_CALL(*mock_eula_screen_, Show()).Times(0);
-  EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(0);
-  EXPECT_CALL(*mock_network_screen_, Show()).Times(1);
-  EXPECT_CALL(*mock_network_screen_, Hide()).Times(0);  // last transition
-  OnExit(*mock_update_screen_,
-         BaseScreenDelegate::UPDATE_ERROR_CHECKING_FOR_UPDATE);
-  CheckCurrentScreen(OobeScreen::SCREEN_OOBE_NETWORK);
-}
-
 // This test verifies that if WizardController fails to apply a non-critical
 // update before the OOBE is marked complete, it allows the user to proceed to
 // log in.
 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,
                        ControlFlowErrorUpdateNonCriticalUpdate) {
   CheckCurrentScreen(OobeScreen::SCREEN_OOBE_NETWORK);
   EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).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);
@@ skipping 155 matching lines @@
 
   void SetUpOnMainThread() override {
     StartupUtils::MarkOobeCompleted();  // Pretend OOBE was complete.
     WizardControllerFlowTest::SetUpOnMainThread();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WizardControllerErrorUpdateAfterCompletedOobeTest);
 };
 
-// This test verifies that if WizardController fails to check for update or
-// apply an update (either critical or non-critical) after the OOBE is marked
-// complete, it allows the user to proceed to log in.
+// This test verifies that if WizardController fails to apply an update, either
+// critical or non-critical, after the OOBE is marked complete, it allows the
+// user to proceed to log in.
 IN_PROC_BROWSER_TEST_P(WizardControllerErrorUpdateAfterCompletedOobeTest,
                        ControlFlowErrorUpdate) {
   const BaseScreenDelegate::ExitCodes update_screen_exit_code = GetParam();
   CheckCurrentScreen(OobeScreen::SCREEN_OOBE_NETWORK);
   EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).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);
   OnExit(*mock_network_screen_, BaseScreenDelegate::NETWORK_CONNECTED);
 
@@ skipping 16 matching lines @@
   EXPECT_CALL(*mock_eula_screen_, Show()).Times(0);
   OnExit(*mock_auto_enrollment_check_screen_,
          BaseScreenDelegate::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
 
   EXPECT_NE(nullptr, ExistingUserController::current_controller());
 }
 
 INSTANTIATE_TEST_CASE_P(
     WizardControllerErrorUpdateAfterCompletedOobe,
     WizardControllerErrorUpdateAfterCompletedOobeTest,
-    testing::Values(BaseScreenDelegate::UPDATE_ERROR_CHECKING_FOR_UPDATE,
-                    BaseScreenDelegate::UPDATE_ERROR_UPDATING,
+    testing::Values(BaseScreenDelegate::UPDATE_ERROR_UPDATING,
                     BaseScreenDelegate::UPDATE_ERROR_UPDATING_CRITICAL_UPDATE));
 
 class WizardControllerDeviceStateTest : public WizardControllerFlowTest {
  protected:
   WizardControllerDeviceStateTest()
       : install_attributes_(ScopedStubInstallAttributes::CreateUnset()) {
     fake_statistics_provider_.SetMachineStatistic(
         system::kSerialNumberKey, "test");
     fake_statistics_provider_.SetMachineStatistic(
         system::kActivateDateKey, "2000-01");
@@ skipping 490 matching lines @@
 
 // TODO(dzhioev): Add tests for controller/host pairing flow.
 // http://crbug.com/375191
 
 // TODO(khmel): Add tests for Arc OptIn flow.
 // http://crbug.com/651144
 static_assert(BaseScreenDelegate::EXIT_CODES_COUNT == 25,
               "tests for new control flow are missing");
 
 }  // namespace chromeos