Implement cloud policy invalidations using the invalidation service framework.

chrome/browser/policy/cloud/user_cloud_policy_manager.cc

Index: chrome/browser/policy/cloud/user_cloud_policy_manager.cc
diff --git a/chrome/browser/policy/cloud/user_cloud_policy_manager.cc b/chrome/browser/policy/cloud/user_cloud_policy_manager.cc
index 09db70154cbd86a1e4e72a3ca7ad5e1d2eaf2930..49fcdd5a5cc5c33d6e0444fcdef0f849e4c27fda 100644
--- a/chrome/browser/policy/cloud/user_cloud_policy_manager.cc
+++ b/chrome/browser/policy/cloud/user_cloud_policy_manager.cc
@@ -6,6 +6,7 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "chrome/browser/invalidation/invalidation_service_factory.h"
 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"
 #include "chrome/browser/policy/cloud/cloud_policy_service.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
@@ -37,6 +38,8 @@ void UserCloudPolicyManager::Connect(
   core()->Connect(client.Pass());
   core()->StartRefreshScheduler();
   core()->TrackRefreshDelayPref(local_state, prefs::kUserPolicyRefreshRate);
+  CreateInvalidator(
+      invalidation::InvalidationServiceFactory::GetForProfile(profile_));
 }
 
 // static
@@ -50,6 +53,7 @@ UserCloudPolicyManager::CreateCloudPolicyClient(
 }
 
 void UserCloudPolicyManager::DisconnectAndRemovePolicy() {
+  UnregisterInvalidator();

[Joao da Silva, 2013/07/24 15:34:07]

This call is not really needed, because store_->Clear() will trigger an
OnStoreLoaded notification, and the CloudPolicyInvalidator already Unregisters()
when that happens.

[Steve Condie, 2013/07/25 01:18:08]

True, although this would subtlely violate the contract of the invalidator class
since core()->Disconnect() would be called before the invalidator was destroyed,
causing invalidator's pointer to the cloud policy client to be invalid.

To solve this problem in the new refactoring I ended up removing the direct
dependency from invalidator to cloud policy client. Now the Clear() should
correctly cause unregistration without violating any dependencies.

   core()->Disconnect();
   store_->Clear();
 }