Move observers to ConfigurationPolicyProvider.

Share more code for ConfigurationPolicyProviders at the base class.
Removed the DummyConfigurationPolicyProvider.
Removed the DummyCloudPolicyProvider.
Moved ApplyPolicyValueTree to PolicyMap.

BUG=chromium-os:17309
TEST=Everything works as before

Review URL: http://codereview.chromium.org/8059029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103274 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 9 deletions

diff --git a/chrome/browser/policy/configuration_policy_provider.h b/chrome/browser/policy/configuration_policy_provider.h
index 202c0d1..5eec497 100644
--- a/chrome/browser/policy/configuration_policy_provider.h
+++ b/chrome/browser/policy/configuration_policy_provider.h
@@ -10,6 +10,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/observer_list.h"
 #include "base/values.h"
 #include "policy/configuration_policy_type.h"
 
@@ -60,8 +61,8 @@ class ConfigurationPolicyProvider {
   virtual bool IsInitializationComplete() const;
 
  protected:
-  // Decodes the value tree and writes the configuration to |result|.
-  void ApplyPolicyValueTree(const DictionaryValue* policies, PolicyMap* result);
+  // Sends a policy update notification to observers.
+  void NotifyPolicyUpdated();
 
   const PolicyDefinitionList* policy_definition_list() const {
     return policy_definition_list_;
@@ -70,19 +71,16 @@ class ConfigurationPolicyProvider {
  private:
   friend class ConfigurationPolicyObserverRegistrar;
 
-  // Temporarily needed for access to ApplyPolicyValueTree as long as we need
-  // to support old-style policy.
-  friend class UserPolicyCache;
-
-  virtual void AddObserver(ConfigurationPolicyProvider::Observer* observer) = 0;
+  virtual void AddObserver(ConfigurationPolicyProvider::Observer* observer);
   virtual void RemoveObserver(
-      ConfigurationPolicyProvider::Observer* observer) = 0;
+      ConfigurationPolicyProvider::Observer* observer);
 
   // Contains the default mapping from policy values to the actual names.
   const ConfigurationPolicyProvider::PolicyDefinitionList*
       policy_definition_list_;
 
- private:
+  ObserverList<ConfigurationPolicyProvider::Observer, true> observer_list_;
+
   DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyProvider);
 };