Enable invalidations for machine level cloud policies
This also renames the kCBCMServiceAccounts feature to kCBCMPolicyInvalidations.
Bug:1026261
Change-Id: Iae54bca447e3af263fc3fd1840639c04ed3652d0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2175542
Reviewed-by: Pavol Marko <[email protected]>
Reviewed-by: Gabriel Charette <[email protected]>
Reviewed-by: Ilya Sherman <[email protected]>
Reviewed-by: Owen Min <[email protected]>
Commit-Queue: anthonyvd <[email protected]>
Cr-Commit-Position: refs/heads/master@{#780333}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index ea04819..b2ddf6d 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -103,6 +103,7 @@
#include "components/feature_engagement/buildflags.h"
#include "components/flags_ui/pref_service_flags_storage.h"
#include "components/image_fetcher/core/cache/image_cache.h"
+#include "components/invalidation/impl/fcm_invalidation_service.h"
#include "components/invalidation/impl/invalidator_registrar_with_memory.h"
#include "components/invalidation/impl/per_user_topic_subscription_manager.h"
#include "components/language/content/browser/geo_language_provider.h"
@@ -352,7 +353,6 @@
#include "chromeos/services/multidevice_setup/multidevice_setup_service.h"
#include "chromeos/timezone/timezone_resolver.h"
#include "components/arc/arc_prefs.h"
-#include "components/invalidation/impl/fcm_invalidation_service.h"
#include "components/onc/onc_pref_names.h"
#include "components/quirks/quirks_manager.h"
#include "extensions/browser/api/lock_screen_data/lock_screen_item_storage.h"
@@ -677,6 +677,7 @@
GpuModeManager::RegisterPrefs(registry);
signin::IdentityManager::RegisterLocalStatePrefs(registry);
IntranetRedirectDetector::RegisterPrefs(registry);
+ invalidation::FCMInvalidationService::RegisterPrefs(registry);
language::GeoLanguageProvider::RegisterLocalStatePrefs(registry);
language::UlpLanguageCodeLocator::RegisterLocalStatePrefs(registry);
memory::EnterpriseMemoryLimitPrefObserver::RegisterPrefs(registry);
@@ -697,6 +698,8 @@
sessions::SessionIdGenerator::RegisterPrefs(registry);
SSLConfigServiceManager::RegisterPrefs(registry);
subresource_filter::IndexedRulesetVersion::RegisterPrefs(registry);
+ syncer::InvalidatorRegistrarWithMemory::RegisterPrefs(registry);
+ syncer::PerUserTopicSubscriptionManager::RegisterPrefs(registry);
SystemNetworkContextManager::RegisterPrefs(registry);
update_client::RegisterPrefs(registry);
variations::VariationsService::RegisterPrefs(registry);
@@ -787,7 +790,6 @@
extensions::lock_screen_data::LockScreenItemStorage::RegisterLocalState(
registry);
extensions::login_api::RegisterLocalStatePrefs(registry);
- invalidation::FCMInvalidationService::RegisterPrefs(registry);
::onc::RegisterPrefs(registry);
policy::AutoEnrollmentClientImpl::RegisterPrefs(registry);
policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry);
@@ -803,8 +805,6 @@
policy::SystemFeaturesDisableListPolicyHandler::RegisterPrefs(registry);
quirks::QuirksManager::RegisterPrefs(registry);
UpgradeDetectorChromeos::RegisterPrefs(registry);
- syncer::PerUserTopicSubscriptionManager::RegisterPrefs(registry);
- syncer::InvalidatorRegistrarWithMemory::RegisterPrefs(registry);
chromeos::cert_provisioning::RegisterLocalStatePrefs(registry);
#endif // defined(OS_CHROMEOS)
