Switch DeviceCloudPolicyInvalidator to shared InvalidationService

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

Index: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
index 9c91387186a79d425e716c1036179d5144d7e031..06f3d1474a20e6c9c85afb8a086142e3f1574357 100644
--- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
+++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
@@ -191,7 +191,8 @@ void BrowserPolicyConnectorChromeOS::Init(
               content::BrowserThread::IO),
           request_context));
   device_local_account_policy_service_->Connect(device_management_service());
-  device_cloud_policy_invalidator_.reset(new DeviceCloudPolicyInvalidator);
+  device_cloud_policy_invalidator_.reset(new DeviceCloudPolicyInvalidator(
+      affiliated_invalidation_service_provider_.get()));
 
   SetTimezoneIfPolicyAvailable();
 
@@ -211,18 +212,9 @@ void BrowserPolicyConnectorChromeOS::PreShutdown() {
   // the DeviceOAuth2TokenService that is destroyed before Shutdown() is called.
   if (affiliated_invalidation_service_provider_)
     affiliated_invalidation_service_provider_->Shutdown();
-
-  // Let the |device_cloud_policy_invalidator_| unregister itself as an
-  // observer of per-Profile InvalidationServices and the device-global
-  // invalidation::TiclInvalidationService it may have created as an observer of
-  // the DeviceOAuth2TokenService that is destroyed before Shutdown() is called.
-  device_cloud_policy_invalidator_.reset();
 }
 
 void BrowserPolicyConnectorChromeOS::Shutdown() {
-  // Verify that PreShutdown() has been called first.
-  DCHECK(!device_cloud_policy_invalidator_);
-
   network_configuration_updater_.reset();
 
   if (device_local_account_policy_service_)