Implement cloud policy invalidations using the invalidation service framework.

chrome/browser/policy/cloud/user_cloud_policy_manager.cc

 // 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.
 
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
 
 #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"
 #include "chrome/browser/policy/cloud/user_cloud_policy_store.h"
 #include "chrome/browser/policy/policy_types.h"
 #include "chrome/common/pref_names.h"
 
 namespace em = enterprise_management;
 
 namespace policy {
@@ skipping 11 matching lines @@
 
 UserCloudPolicyManager::~UserCloudPolicyManager() {
   UserCloudPolicyManagerFactory::GetInstance()->Unregister(profile_, this);
 }
 
 void UserCloudPolicyManager::Connect(
     PrefService* local_state, scoped_ptr<CloudPolicyClient> client) {
   core()->Connect(client.Pass());
   core()->StartRefreshScheduler();
   core()->TrackRefreshDelayPref(local_state, prefs::kUserPolicyRefreshRate);
+  CreateInvalidator(
+      invalidation::InvalidationServiceFactory::GetForProfile(profile_));
 }
 
 // static
 scoped_ptr<CloudPolicyClient>
 UserCloudPolicyManager::CreateCloudPolicyClient(
     DeviceManagementService* device_management_service) {
   return make_scoped_ptr(
       new CloudPolicyClient(std::string(), std::string(),
                             USER_AFFILIATION_NONE,
                             NULL, device_management_service)).Pass();
 }
 
 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();
 }
 
 bool UserCloudPolicyManager::IsClientRegistered() const {
   return client() && client()->is_registered();
 }
 
 }  // namespace policy