Refactored ConfigurationPolicyProvider to provide PolicyBundles instead of PolicyMaps.

chrome/browser/policy/configuration_policy_provider.h

 // 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.
 
 #ifndef CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_H_
 #define CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_H_
 #pragma once
 
-#include <map>
-#include <string>
-
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
+#include "chrome/browser/policy/policy_bundle.h"
 
 namespace policy {
 
 struct PolicyDefinitionList;
 class PolicyMap;
 
 // A mostly-abstract super class for platform-specific policy providers.
 // Platform-specific policy providers (Windows Group Policy, gconf,
 // etc.) should implement a subclass of this class.
 class ConfigurationPolicyProvider {
  public:
   class Observer {
    public:
     virtual ~Observer();
     virtual void OnUpdatePolicy(ConfigurationPolicyProvider* provider) = 0;
     virtual void OnProviderGoingAway(ConfigurationPolicyProvider* provider);
   };
 
   explicit ConfigurationPolicyProvider(const PolicyDefinitionList* policy_list);
 
   virtual ~ConfigurationPolicyProvider();
 
   // Fills the given |result| with the current policy values. Returns true if
   // the policies were provided. This is used mainly by the
   // ConfigurationPolicyPrefStore, which retrieves policy values from here.
+  // DEPRECATED: this call is going away, use policies() instead.
+  // http://crbug.com/108993
   bool Provide(PolicyMap* result);
 
+  // Returns the current PolicyBundle.
+  const PolicyBundle& policies() const { return policy_bundle_; }
+
   // Check whether this provider has completed initialization. This is used to
   // detect whether initialization is done in case providers implementations
   // need to do asynchronous operations for initialization.
   virtual bool IsInitializationComplete() const;
 
   // Asks the provider to refresh its policies. All the updates caused by this
   // call will be visible on the next call of OnUpdatePolicy on the observers,
   // which are guaranteed to happen even if the refresh fails.
   // It is possible that OnProviderGoingAway is called first though, and
   // OnUpdatePolicy won't be called if that happens.
   virtual void RefreshPolicies() = 0;
 
   // Utility method that converts deprecated policies into their corresponding
   // actual policies. Subclasses can use this to fix deprecated policies in
   // PolicyMaps that they obtained from elsewhere.
   static void FixDeprecatedPolicies(PolicyMap* policies);
 
  protected:
-  // Sends a policy update notification to observers.
-  void NotifyPolicyUpdated();
-
-  // Must be implemented by subclasses to provide their policy values.
-  virtual bool ProvideInternal(PolicyMap* result) = 0;
+  // Subclasses must invoke this to update the policies currently served by
+  // this provider. UpdateProviderPolicy() takes ownership of |policies|.
+  // The observers are notified after the policies are updated.
+  void UpdateProviderPolicy(scoped_ptr<PolicyBundle> bundle);

[Mattias Nissler (ping if slow), 2012/05/14 09:07:21]

Why not just UpdatePolicy()?

[Joao da Silva, 2012/05/14 09:39:17]

Done.

 
   const PolicyDefinitionList* policy_definition_list() const {
     return policy_definition_list_;
   }
 
  private:
   friend class ConfigurationPolicyObserverRegistrar;
 
   virtual void AddObserver(Observer* observer);
   virtual void RemoveObserver(Observer* observer);
 
+  // The policies currently configured at this provider.
+  PolicyBundle policy_bundle_;
+
   // Contains the default mapping from policy values to the actual names.
   const PolicyDefinitionList* policy_definition_list_;
 
   ObserverList<Observer, true> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyProvider);
 };
 
 // Manages observers for a ConfigurationPolicyProvider. Is used to register
 // observers, and automatically removes them upon destruction.
@@ skipping 18 matching lines @@
  private:
   ConfigurationPolicyProvider* provider_;
   ConfigurationPolicyProvider::Observer* observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyObserverRegistrar);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_H_