Implement cloud policy invalidations using the invalidation service framework.

chrome/browser/policy/cloud/cloud_policy_manager.h

Index: chrome/browser/policy/cloud/cloud_policy_manager.h
diff --git a/chrome/browser/policy/cloud/cloud_policy_manager.h b/chrome/browser/policy/cloud/cloud_policy_manager.h
index 34be652e8e2a0fd8524a0a9f259c018900ee4ed0..7e34e93561091fe519f7b89beec9b5f912d1cce5 100644
--- a/chrome/browser/policy/cloud/cloud_policy_manager.h
+++ b/chrome/browser/policy/cloud/cloud_policy_manager.h
@@ -12,9 +12,14 @@
 #include "base/prefs/pref_member.h"
 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"
 #include "chrome/browser/policy/cloud/cloud_policy_core.h"
+#include "chrome/browser/policy/cloud/cloud_policy_invalidator.h"
 #include "chrome/browser/policy/cloud/cloud_policy_store.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
 
+namespace invalidation {
+class InvalidationService;
+}
+
 namespace policy {
 
 class PolicyBundle;
@@ -27,7 +32,8 @@ class PolicyBundle;
 // functionality specific to user-level and device-level cloud policy, such as
 // blocking on initial user policy fetch or device enrollment.
 class CloudPolicyManager : public ConfigurationPolicyProvider,
-                           public CloudPolicyStore::Observer {
+                           public CloudPolicyStore::Observer,
+                           public CloudPolicyInvalidationHandler {
  public:
   CloudPolicyManager(const PolicyNamespaceKey& policy_ns_key,
                      CloudPolicyStore* cloud_policy_store);
@@ -45,11 +51,34 @@ class CloudPolicyManager : public ConfigurationPolicyProvider,
   virtual void OnStoreLoaded(CloudPolicyStore* cloud_policy_store) OVERRIDE;
   virtual void OnStoreError(CloudPolicyStore* cloud_policy_store) OVERRIDE;
 
+  // CloudPolicyInvalidationHandler:
+  virtual void InvalidatePolicy() OVERRIDE;
+  virtual void OnInvalidatorStateChanged(bool invalidations_enabled) OVERRIDE;
+
  protected:
   // Check whether fully initialized and if so, publish policy by calling
   // ConfigurationPolicyStore::UpdatePolicy().
   void CheckAndPublishPolicy();
 
+  // Enable policy invalidations to be received by creating the invalidator
+  // object. The refresh scheduler must be started before calling this method.
+  // |service| is the invalidation service to use and must remain valid until
+  // Shutdown or UnregisterInvalidator is called.
+  // |ignore_switch| is intended to allow invalidator creation in unit tests
+  // (ignoring the command line flag normally required to enable invalidation).
+  void CreateInvalidator(invalidation::InvalidationService* service) {
+    CreateInvalidator(service, false /* ignore_switch */);
+  }
+  void CreateInvalidator(
+      invalidation::InvalidationService* service,
+      bool ignore_switch);
+
+  // Causes the invalidator to unregister with the invalidation service and then
+  // destroys the invalidator. This method should only be called when policy is
+  // no longer applied; it should not be called for normal browser shutdown.
+  // This method has no effect if CreateInvalidator has not been called.
+  void UnregisterInvalidator();
+
   // Called by CheckAndPublishPolicy() to create a bundle with the current
   // policies.
   virtual scoped_ptr<PolicyBundle> CreatePolicyBundle();
@@ -72,6 +101,9 @@ class CloudPolicyManager : public ConfigurationPolicyProvider,
   // policy update notifications are deferred until after it completes.
   bool waiting_for_policy_refresh_;
 
+  // The policy invalidator, which handles invalidations to the policy.
+  scoped_ptr<CloudPolicyInvalidator> invalidator_;
+
   DISALLOW_COPY_AND_ASSIGN(CloudPolicyManager);
 };