Fix behavior of cloud policy refreshes scheduled for soon

components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc

Index: components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
diff --git a/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc b/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
index 8df64b1bbd6d58f27415bec89f9bd9dad008a569..9b9fbe3378cd9ef1773ec62a044e7b822f6d7e31 100644
--- a/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
@@ -211,6 +211,36 @@ TEST_F(CloudPolicyRefreshSchedulerTest, RefreshSoon) {
   Mock::VerifyAndClearExpectations(&client_);
 }
 
+TEST_F(CloudPolicyRefreshSchedulerTest, RefreshSoonOverriding) {
+  std::unique_ptr<CloudPolicyRefreshScheduler> scheduler(
+      CreateRefreshScheduler());
+
+  // The refresh scheduled for soon overrides the previously scheduled refresh.
+  scheduler->RefreshSoon();
+  CheckTiming(0);
+
+  // The refresh scheduled for soon is not overridden by the change of the
+  // desired refresh delay.
+  const int64_t kNewPolicyRefreshRate = 12 * 60 * 60 * 1000;
+  scheduler->SetDesiredRefreshDelay(kNewPolicyRefreshRate);
+  CheckTiming(0);
+
+  // The refresh scheduled for soon is not overridden by the notification on the
+  // already fetched policy.
+  client_.SetPolicy(dm_protocol::kChromeUserPolicyType, std::string(),
+                    em::PolicyFetchResponse());
+  store_.NotifyStoreLoaded();
+  CheckTiming(0);
+
+  EXPECT_CALL(client_, FetchPolicy()).Times(1);
+  task_runner_->RunUntilIdle();
+  Mock::VerifyAndClearExpectations(&client_);
+
+  // The next refresh is scheduled according to the normal rate.
+  client_.NotifyPolicyFetched();
+  CheckTiming(kNewPolicyRefreshRate);
+}
+
 TEST_F(CloudPolicyRefreshSchedulerTest, InvalidationsAvailable) {
   std::unique_ptr<CloudPolicyRefreshScheduler> scheduler(
       new CloudPolicyRefreshScheduler(&client_, &store_, task_runner_));