Added ConfigurationPolicyProvider::RefreshPolicies.

chrome/browser/policy/asynchronous_policy_provider.h

 // 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.
 
 #ifndef CHROME_BROWSER_POLICY_ASYNCHRONOUS_POLICY_PROVIDER_H_
 #define CHROME_BROWSER_POLICY_ASYNCHRONOUS_POLICY_PROVIDER_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
 
 namespace policy {
 
 class AsynchronousPolicyLoader;
 
 // Policy provider that loads policy asynchronously. Providers should subclass
 // from this class if loading the policy requires disk access or must for some
 // other reason be performed on the file thread. The actual logic for loading
@@ skipping 10 matching lines @@
 
     virtual DictionaryValue* Load() = 0;
   };
 
   // Assumes ownership of |loader|.
   AsynchronousPolicyProvider(
       const PolicyDefinitionList* policy_list,
       scoped_refptr<AsynchronousPolicyLoader> loader);
   virtual ~AsynchronousPolicyProvider();
 
-  // Force a policy reload from the underlying data source.
-  void ForceReload();
-
- protected:
   // ConfigurationPolicyProvider implementation.
   virtual bool ProvideInternal(PolicyMap* map) OVERRIDE;
+  virtual void RefreshPolicies() OVERRIDE;
+
+ private:
+  // Callbacks from the loader. OnRefreshReload is invoked when an explicitly
+  // requested refresh is done, while OnUnexpectedReload is invoked when the
+  // loader refreshed its policies without being triggered.
+  void OnRefreshReload();
+  void OnUnexpectedReload();
 
   // The loader object used internally.
   scoped_refptr<AsynchronousPolicyLoader> loader_;
 
- private:
+  // Used to create and invalidate WeakPtrs from RefreshPolicies, to make sure
+  // that notifications are only issued after any pending reloads are done.
+  base::WeakPtrFactory<AsynchronousPolicyProvider> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(AsynchronousPolicyProvider);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_ASYNCHRONOUS_POLICY_PROVIDER_H_