Make Hands-Off Zero-Touch Enrollment compatibile with tests

chrome/browser/chromeos/login/screens/update_screen.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/screens/update_screen.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
@@ skipping 74 matching lines @@
 
 // Delay before showing error message if captive portal is detected.
 // We wait for this delay to let captive portal to perform redirect and show
 // its login page before error message appears.
 const int kDelayErrorMessageSec = 10;
 
 // The delay in milliseconds at which we will send the host status to the Master
 // device periodically during the updating process.
 const int kHostStatusReportDelay = 5 * 60 * 1000;
 
+// If we check for an update and there is no need to perform an update,
+// this is the time in hours we should wait before checking again.
+const int kUpdateCheckRecencyThresholdInHours = 1;

[xiyuan, 2017/05/09 22:03:52]

nit: We can move this into where it is used since it is used only in one place.

[kumarniranjan, 2017/05/09 22:49:47]

Done.

+
 // Invoked from call to RequestUpdateCheck upon completion of the DBus call.
 void StartUpdateCallback(UpdateScreen* screen,
                          UpdateEngineClient::UpdateCheckResult result) {
   VLOG(1) << "Callback from RequestUpdateCheck, result " << result;
   if (UpdateScreen::HasInstance(screen)) {
     if (result == UpdateEngineClient::UPDATE_RESULT_SUCCESS)
       screen->SetIgnoreIdleStatus(false);
     else
       screen->ExitUpdate(UpdateScreen::REASON_UPDATE_INIT_FAILED);
   }
@@ skipping 89 matching lines @@
           break;
         case UpdateEngineClient::UPDATE_STATUS_UPDATE_AVAILABLE:
         case UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT:
         case UpdateEngineClient::UPDATE_STATUS_DOWNLOADING:
         case UpdateEngineClient::UPDATE_STATUS_FINALIZING:
         case UpdateEngineClient::UPDATE_STATUS_VERIFYING:
           DCHECK(!HasCriticalUpdate());
         // Noncritical update, just exit screen as if there is no update.
         // no break
         case UpdateEngineClient::UPDATE_STATUS_IDLE:
+          // At this point, there is either no update available, or there is
+          // a noncritical update available. No need to update during OOBE.
+          RecordUpdateNotRequired();
           Finish(ScreenExitCode::UPDATE_NOUPDATE);
           break;
         case UpdateEngineClient::UPDATE_STATUS_ERROR:
         case UpdateEngineClient::UPDATE_STATUS_REPORTING_ERROR_EVENT:
           if (is_checking_for_update_) {
             Finish(ScreenExitCode::UPDATE_ERROR_CHECKING_FOR_UPDATE);
           } else if (HasCriticalUpdate()) {
             Finish(ScreenExitCode::UPDATE_ERROR_UPDATING_CRITICAL_UPDATE);
           } else {
             Finish(ScreenExitCode::UPDATE_ERROR_UPDATING);
@@ skipping 331 matching lines @@
 }
 
 void UpdateScreen::StartUpdateCheck() {
   error_message_timer_.Stop();
   GetErrorScreen()->HideCaptivePortal();
 
   network_portal_detector::GetInstance()->RemoveObserver(this);
   connect_request_subscription_.reset();
   if (state_ == State::STATE_ERROR)
     HideErrorMessage();
+
+  if (UsingHandsOffEnrollment() && RecentUpdateCheckWithoutUpdate()) {
+    LOG(WARNING) << "Skipping update check since one was done recently "
+                    "which did not result in an update.";
+    CancelUpdate();
+    return;
+  }
+
   state_ = State::STATE_UPDATE;
   DBusThreadManager::Get()->GetUpdateEngineClient()->AddObserver(this);
   VLOG(1) << "Initiate update check";
   DBusThreadManager::Get()->GetUpdateEngineClient()->RequestUpdateCheck(
       base::Bind(StartUpdateCallback, this));
 }
 
 void UpdateScreen::ShowErrorMessage() {
   LOG(WARNING) << "UpdateScreen::ShowErrorMessage()";
 
@@ skipping 55 matching lines @@
       &UpdateScreen::ShowErrorMessage);
 }
 
 void UpdateScreen::OnConnectRequested() {
   if (state_ == State::STATE_ERROR) {
     LOG(WARNING) << "Hiding error message since AP was reselected";
     StartUpdateCheck();
   }
 }
 
+void UpdateScreen::RecordUpdateCheckWithoutUpdate() {
+  StartupUtils::SaveTimeOfLastUpdateCheckWithoutUpdate(base::Time::Now());
+}
+
+bool UpdateScreen::RecentUpdateCheckWithoutUpdate() {
+  return (base::Time::Now() -

[xiyuan, 2017/05/09 22:03:52]

Wall clock could go backward. Let's do a compare before calculating delta.

[kumarniranjan, 2017/05/09 22:49:47]

Done.

+          StartupUtils::GetTimeOfLastUpdateCheckWithoutUpdate()) >

[xiyuan, 2017/05/09 22:03:52]

GetTimeOfLastUpdateCheckWithoutUpdate() might not have a valid base::Time, e.g.
on the very first run. Let's handle that explicitly.

[kumarniranjan, 2017/05/09 22:49:47]

Is adding it to the PrefsRegistry enough?
https://cs.chromium.org/chromium/src/chrome/browser/chromeos/login/startup_ut...

+         base::TimeDelta::FromHours(kUpdateCheckRecencyThresholdInHours);
+}
+
 }  // namespace chromeos