Switch DeviceCloudPolicyInvalidator to shared InvalidationService

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

 // Copyright 2014 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/chromeos/policy/browser_policy_connector_chromeos.h"
 
 #include <string>
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 173 matching lines @@
           chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
           chromeos::DeviceSettingsService::Get(),
           chromeos::CrosSettings::Get(),
           GetBackgroundTaskRunner(),
           GetBackgroundTaskRunner(),
           GetBackgroundTaskRunner(),
           content::BrowserThread::GetMessageLoopProxyForThread(
               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();
 
   network_configuration_updater_ =
       DeviceNetworkConfigurationUpdater::CreateForDevicePolicy(
           GetPolicyService(),
           chromeos::NetworkHandler::Get()
               ->managed_network_configuration_handler(),
           chromeos::NetworkHandler::Get()->network_device_handler(),
           chromeos::CrosSettings::Get());
 }
 
 void BrowserPolicyConnectorChromeOS::PreShutdown() {
   // Let the |affiliated_invalidation_service_provider_| 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.
   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_)
     device_local_account_policy_service_->Shutdown();
 
   if (device_cloud_policy_initializer_)
     device_cloud_policy_initializer_->Shutdown();
 
   if (device_cloud_policy_manager_)
     device_cloud_policy_manager_->RemoveDeviceCloudPolicyManagerObserver(this);
@@ skipping 122 matching lines @@
           consumer_device_management_service_.get(),
           GetBackgroundTaskRunner(),
           install_attributes_.get(),
           state_keys_broker_.get(),
           device_cloud_policy_manager_->device_store(),
           device_cloud_policy_manager_));
   device_cloud_policy_initializer_->Init();
 }
 
 }  // namespace policy