Don't refresh policy immediately when fetched already.

chrome/browser/policy/cloud_policy_refresh_scheduler.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/policy/cloud_policy_refresh_scheduler.h"
 
 #include <algorithm>
 
 #include "base/task_runner.h"
 #include "chrome/browser/policy/cloud_policy_constants.h"
@@ skipping 98 matching lines @@
 
   ScheduleRefresh();
 }
 
 void CloudPolicyRefreshScheduler::OnIPAddressChanged() {
   if (client_->status() == DM_STATUS_REQUEST_FAILED)
     RefreshAfter(0);
 }
 
 void CloudPolicyRefreshScheduler::UpdateLastRefreshFromPolicy() {
-  if (store_->has_policy() && !store_->is_managed() &&
-      last_refresh_.is_null()) {
+  if (!last_refresh_.is_null())
+    return;
+
+  // If the client has already fetched policy, assume that happened recently. If
+  // that assumption ever breaks, the proper thing to do probably is to move the
+  // |last_refresh_| bookkeeping to CloudPolicyClient.
+  if (client_->policy()) {
+    last_refresh_ = base::Time::NowFromSystemTime();
+    return;
+  }
+
+  // If there is a cached non-managed response, make sure to only re-query the
+  // server after kUnmanagedRefreshDelayMs. NB: For existing policy, an
+  // immediate refresh is intentional.
+  if (store_->has_policy() && !store_->is_managed()) {
     last_refresh_ =
         base::Time::UnixEpoch() +
         base::TimeDelta::FromMilliseconds(store_->policy()->timestamp());
   }
 }
 
 void CloudPolicyRefreshScheduler::ScheduleRefresh() {
   // If the client isn't registered, there is nothing to do.
   if (!client_->is_registered()) {
     refresh_callback_.Cancel();
@@ skipping 66 matching lines @@
   task_runner_->PostDelayedTask(FROM_HERE, refresh_callback_.callback(), delay);
 }
 
 int64 CloudPolicyRefreshScheduler::GetRefreshDelay() {
   return std::min(std::max<int64>(refresh_delay_.GetValue(),
                                   kRefreshDelayMinMs),
                   kRefreshDelayMaxMs);
 }
 
 }  // namespace policy