Added ConfigurationPolicyProvider::RefreshPolicies.

chrome/browser/policy/asynchronous_policy_provider.cc

Index: chrome/browser/policy/asynchronous_policy_provider.cc
diff --git a/chrome/browser/policy/asynchronous_policy_provider.cc b/chrome/browser/policy/asynchronous_policy_provider.cc
index 54057abd636c13de1ad988dcdf469b1a3a0ea8b4..98d93152c34a253d7c408fcb5fbf7fa7ad6a625b 100644
--- a/chrome/browser/policy/asynchronous_policy_provider.cc
+++ b/chrome/browser/policy/asynchronous_policy_provider.cc
@@ -7,6 +7,9 @@
 #include "base/bind.h"
 #include "chrome/browser/policy/asynchronous_policy_loader.h"
 #include "chrome/browser/policy/policy_map.h"
+#include "content/public/browser/browser_thread.h"
+
+using content::BrowserThread;
 
 namespace policy {
 
@@ -14,9 +17,10 @@ AsynchronousPolicyProvider::AsynchronousPolicyProvider(
     const PolicyDefinitionList* policy_list,
     scoped_refptr<AsynchronousPolicyLoader> loader)
     : ConfigurationPolicyProvider(policy_list),
-      loader_(loader) {
+      loader_(loader),
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   loader_->Init(
-      base::Bind(&AsynchronousPolicyProvider::NotifyPolicyUpdated,
+      base::Bind(&AsynchronousPolicyProvider::OnUnexpectedReload,
                  base::Unretained(this)));
 }
 
@@ -27,15 +31,40 @@ AsynchronousPolicyProvider::~AsynchronousPolicyProvider() {
   loader_->Stop();
 }
 
-void AsynchronousPolicyProvider::ForceReload() {
-  loader_->Reload(true);
-}
-
 bool AsynchronousPolicyProvider::ProvideInternal(PolicyMap* map) {
   DCHECK(CalledOnValidThread());
-  DCHECK(loader_->policy());
+  if (!loader_->policy())
+    return false;
   map->LoadFrom(loader_->policy(), policy_definition_list());
   return true;
 }
 
+void AsynchronousPolicyProvider::RefreshPolicies() {
+  DCHECK(CalledOnValidThread());
+  // Invalidate any pending callbacks issued from here.
+  weak_ptr_factory_.InvalidateWeakPtrs();
+  // Post a new callback with a fresh WeakPtr to Reload.
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
+      base::Bind(&AsynchronousPolicyLoader::Reload,
+                 loader_,
+                 base::Bind(&AsynchronousPolicyProvider::OnRefreshReload,
+                            weak_ptr_factory_.GetWeakPtr()),
+                 true));
+}
+
+void AsynchronousPolicyProvider::OnRefreshReload() {
+  DCHECK(CalledOnValidThread());
+  NotifyPolicyUpdated();
+}
+
+void AsynchronousPolicyProvider::OnUnexpectedReload() {
+  DCHECK(CalledOnValidThread());
+  // Don't notify now if we're waiting for a Reload requested from
+  // RefreshPolicies.
+  if (weak_ptr_factory_.HasWeakPtrs())
+    return;
+  NotifyPolicyUpdated();
+}
+
 }  // namespace policy