Add AffiliatedInvalidationServiceProvider

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 a329ba07fc123ef34c09e061f49624980ceb9883..0a649fd1eda1fcdd60b5909250493ef8509652f2 100644
--- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
+++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
@@ -17,6 +17,7 @@
 #include "base/sequenced_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
+#include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provider.h"
 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h"
@@ -151,6 +152,9 @@ void BrowserPolicyConnectorChromeOS::Init(
     scoped_refptr<net::URLRequestContextGetter> request_context) {
   ChromeBrowserPolicyConnector::Init(local_state, request_context);
 
+  affiliated_invalidation_service_provider_.reset(
+      new AffiliatedInvalidationServiceProvider);
+
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(chromeos::switches::kEnableConsumerManagement)) {
@@ -212,6 +216,7 @@ void BrowserPolicyConnectorChromeOS::Init(
 }
 
 void BrowserPolicyConnectorChromeOS::PreShutdown() {
+  affiliated_invalidation_service_provider_.reset();
   // 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
@@ -221,6 +226,7 @@ void BrowserPolicyConnectorChromeOS::PreShutdown() {
 
 void BrowserPolicyConnectorChromeOS::Shutdown() {
   // Verify that PreShutdown() has been called first.
+  DCHECK(!affiliated_invalidation_service_provider_);
   DCHECK(!device_cloud_policy_invalidator_);
 
   network_configuration_updater_.reset();