Chrome OS: Get rid of delay in FakeSessionManagerClient

Follow-up to CL:1564085

Bug: 934224
Change-Id: I8291ed461528d6f31ee5167289740296fea29cbe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1583779Reviewed-by: Pavol Marko <pmarko@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659057}

chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc

@@ -46,6 +46,8 @@ constexpr int kInitialEnrollmentModulusPowerLimit = 6;
 // (https://crbug.com/846645).
 const int kInitialEnrollmentModulusPowerOutdatedServer = 14;
 
+const int kMaxRequestStateKeysTries = 10;
+
 // Maximum time to wait for the auto-enrollment check to reach a decision.
 // Note that this encompasses all steps |AutoEnrollmentController| performs in
 // order to determine if the device should be auto-enrolled.
@@ -427,6 +429,7 @@ void AutoEnrollmentController::Start() {
   safeguard_timer_.Start(FROM_HERE, kSafeguardTimeout,
                          base::BindRepeating(&AutoEnrollmentController::Timeout,
                                              weak_ptr_factory_.GetWeakPtr()));
+  request_state_keys_tries_ = 0;
 
   // The system clock sync state is not known yet, and this
   // |AutoEnrollmentController| could wait for it if requested.
@@ -481,11 +484,6 @@ void AutoEnrollmentController::SetAutoEnrollmentClientFactoryForTesting(
   testing_auto_enrollment_client_factory_ = auto_enrollment_client_factory;
 }
 
-void AutoEnrollmentController::FireSafeguardTimerForTesting() {
-  DCHECK(safeguard_timer_.IsRunning());
-  safeguard_timer_.FireNow();
-}
-
 AutoEnrollmentController::InitialEnrollmentRequirement
 AutoEnrollmentController::GetInitialEnrollmentRequirement() {
   system::StatisticsProvider* provider =
@@ -639,6 +637,7 @@ void AutoEnrollmentController::OnOwnershipStatusCheckDone(
     case DeviceSettingsService::OWNERSHIP_NONE:
       switch (auto_enrollment_check_type_) {
         case AutoEnrollmentCheckType::kFRE:
+          ++request_state_keys_tries_;
           // For FRE, request state keys first.
           g_browser_process->platform_part()
               ->browser_policy_connector_chromeos()
@@ -675,6 +674,13 @@ void AutoEnrollmentController::StartClientForFRE(
   if (state_keys.empty()) {
     LOG(ERROR) << "No state keys available";
     if (fre_requirement_ == FRERequirement::kExplicitlyRequired) {
+      if (request_state_keys_tries_ >= kMaxRequestStateKeysTries) {
+        if (safeguard_timer_.IsRunning())
+          safeguard_timer_.Stop();
+        Timeout();
+        return;
+      }
+      ++request_state_keys_tries_;
       // Retry to fetch the state keys. For devices where FRE is required to be
       // checked, we can't proceed with empty state keys.
       g_browser_process->platform_part()

chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h

@@ -143,8 +143,6 @@ class AutoEnrollmentController {
   void SetAutoEnrollmentClientFactoryForTesting(
       policy::AutoEnrollmentClient::Factory* auto_enrollment_client_factory);
 
-  void FireSafeguardTimerForTesting();
-
  private:
   class SystemClockSyncWaiter;
 
@@ -286,6 +284,9 @@ class AutoEnrollmentController {
   // it's never set back to |false|.
   bool system_clock_sync_wait_requested_ = false;
 
+  // Keeps track of number of tries to request state keys.
+  int request_state_keys_tries_ = 0;
+
   // TODO(igorcov): Merge the two weak_ptr factories in one.
   base::WeakPtrFactory<AutoEnrollmentController> client_start_weak_factory_{
       this};

chrome/browser/chromeos/login/enrollment/enrollment_local_policy_server_browsertest.cc

@@ -137,12 +137,6 @@ class AutoEnrollmentLocalPolicyServer : public EnrollmentLocalPolicyServerBase {
         ->GetStateKeysBroker();
   }
 
-  void FireSafeguardTimer() {
-    WizardController::default_controller()
-        ->GetAutoEnrollmentController()
-        ->FireSafeguardTimerForTesting();
-  }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(AutoEnrollmentLocalPolicyServer);
 };
@@ -534,9 +528,6 @@ IN_PROC_BROWSER_TEST_F(AutoEnrollmentNoStateKeys, FREExplicitlyRequired) {
   host()->StartWizard(AutoEnrollmentCheckScreenView::kScreenId);
   OobeScreenWaiter(AutoEnrollmentCheckScreenView::kScreenId).Wait();
 
-  // Chrome waits for state keys to be available, force a timeout.
-  FireSafeguardTimer();
-
   OobeScreenWaiter(ErrorScreenView::kScreenId).Wait();
   test::OobeJS().ExpectHasNoClass("allow-guest-signin", {"error-message"});
 }

chromeos/dbus/session_manager/fake_session_manager_client.cc

@@ -545,12 +545,7 @@ void FakeSessionManagerClient::SetFlagsForUser(
 void FakeSessionManagerClient::GetServerBackedStateKeys(
     StateKeysCallback callback) {
   if (force_state_keys_missing_) {
-    // Need delay to prevent excessive warning output in tests caused by being
-    // retried in a tight loop.
-    base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
-        FROM_HERE,
-        base::BindOnce(std::move(callback), std::vector<std::string>()),
-        base::TimeDelta::FromSeconds(1));
+    PostReply(FROM_HERE, std::move(callback), std::vector<std::string>());
     return;
   }