Added ConfigurationPolicyProvider::RefreshPolicies.

chrome/browser/policy/cloud_policy_provider_impl.cc

 // Copyright (c) 2011 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_provider_impl.h"
 
+#include <algorithm>
+
+#include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 
 namespace policy {
 
 CloudPolicyProviderImpl::CloudPolicyProviderImpl(
+    BrowserPolicyConnector* browser_policy_connector,
     const PolicyDefinitionList* policy_list,
     CloudPolicyCacheBase::PolicyLevel level)
     : CloudPolicyProvider(policy_list),
+      browser_policy_connector_(browser_policy_connector),
       level_(level),
       initialization_complete_(true) {}
 
 CloudPolicyProviderImpl::~CloudPolicyProviderImpl() {
   for (ListType::iterator i = caches_.begin(); i != caches_.end(); ++i)
     (*i)->RemoveObserver(this);
 }
 
 bool CloudPolicyProviderImpl::ProvideInternal(PolicyMap* result) {
   result->CopyFrom(combined_);
   return true;
 }
 
 bool CloudPolicyProviderImpl::IsInitializationComplete() const {
   return initialization_complete_;
 }
 
+void CloudPolicyProviderImpl::RefreshPolicies() {
+  pending_update_caches_ = caches_;
+  if (pending_update_caches_.empty())
+    NotifyPolicyUpdated();
+  else
+    browser_policy_connector_->FetchCloudPolicy();

[Mattias Nissler (ping if slow), 2011/11/18 11:00:25]

I think there's still an issue here. This will notify CloudPolicyController but
it will only post a task to the message loop that will then reset the backend
and issue a new policy fetch. In the mean time, an earlier policy fetch can
potentially post back it's results...

[Joao da Silva, 2011/11/18 14:03:30]

FetchCloudPolicy() triggers CloudPolicyController::OnDeviceTokenChanged on the
same iteration of the loop, which in turn calls SetState() where the backend_
(and any pending reply it might have) is immediately dropped.

+}
+
 void CloudPolicyProviderImpl::OnCacheUpdate(CloudPolicyCacheBase* cache) {
+  RemoveFromPending(cache);
   RecombineCachesAndTriggerUpdate();
 }
 
 void CloudPolicyProviderImpl::OnCacheGoingAway(CloudPolicyCacheBase* cache) {
+  RemoveFromPending(cache);
   cache->RemoveObserver(this);
   for (ListType::iterator i = caches_.begin(); i != caches_.end(); ++i) {

[Mattias Nissler (ping if slow), 2011/11/18 11:00:25]

can we please use std::find + erase here? :) Also, it's basically the same as
RemoveFromPending, so you could share code.

[Joao da Silva, 2011/11/18 14:03:30]

Done.

     if (*i == cache) {
       caches_.erase(i);
       break;
     }
   }
 
   RecombineCachesAndTriggerUpdate();
 }
 
 void CloudPolicyProviderImpl::AppendCache(CloudPolicyCacheBase* cache) {
@@ skipping 56 matching lines @@
   for (ListType::iterator i = caches_.begin(); i != caches_.end(); ++i) {
     if (!(*i)->IsReady())
       continue;
     PolicyMap tmp_map;
     CombineTwoPolicyMaps(newly_combined, *(*i)->policy(level_), &tmp_map);
     newly_combined.Swap(&tmp_map);
   }
 
   // Trigger a notification.
   combined_.Swap(&newly_combined);
-  NotifyPolicyUpdated();
+  if (pending_update_caches_.empty())
+    NotifyPolicyUpdated();
+}
+
+void CloudPolicyProviderImpl::RemoveFromPending(CloudPolicyCacheBase* cache) {
+  pending_update_caches_.erase(
+      std::remove(pending_update_caches_.begin(),
+                  pending_update_caches_.end(),
+                  cache),
+      pending_update_caches_.end());
 }
 
 }  // namespace policy