Remove enable_supervised_users buildflag from chrome/browser/
Since chrome no longer supports fuchsia the ENABLE_SUPERVISED_USERS
build flag can be removed as supervised users are currently supported
on all platforms
Bug: b:329809565
Change-Id: I0ff6d039af0daf811a7e25d9d133423ed65b65bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5393363
Reviewed-by: Arthur Sonzogni <[email protected]>
Commit-Queue: Liza Bipin <[email protected]>
Reviewed-by: Alex Ilin <[email protected]>
Reviewed-by: Duong Dac <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1278526}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 1950205d..faf3fa04 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -171,7 +171,6 @@
#include "components/subresource_filter/content/browser/ruleset_service.h"
#include "components/subresource_filter/core/browser/subresource_filter_constants.h"
#include "components/supervised_user/core/browser/supervised_user_preferences.h"
-#include "components/supervised_user/core/common/buildflags.h"
#include "components/sync/base/pref_names.h"
#include "components/sync/service/glue/sync_transport_data_prefs.h"
#include "components/sync/service/sync_prefs.h"
@@ -238,11 +237,6 @@
#include "chrome/browser/screen_ai/pref_names.h"
#endif
-#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
-#include "components/supervised_user/core/browser/child_account_service.h"
-#include "components/supervised_user/core/browser/supervised_user_service.h"
-#endif
-
#include "components/feed/buildflags.h"
#include "components/feed/core/common/pref_names.h"
#include "components/feed/core/shared_prefs/pref_names.h"
@@ -1822,6 +1816,7 @@
SharingSyncPreference::RegisterProfilePrefs(registry);
site_engagement::SiteEngagementService::RegisterProfilePrefs(registry);
storage::RegisterProfilePrefs(registry);
+ supervised_user::RegisterProfilePrefs(registry);
sync_sessions::SessionSyncPrefs::RegisterProfilePrefs(registry);
syncer::DeviceInfoPrefs::RegisterProfilePrefs(registry);
syncer::SyncPrefs::RegisterProfilePrefs(registry);
@@ -1875,10 +1870,6 @@
ChromeRLZTrackerDelegate::RegisterProfilePrefs(registry);
#endif
-#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
- supervised_user::RegisterProfilePrefs(registry);
-#endif
-
#if BUILDFLAG(ENABLE_FEED_V2)
feed::prefs::RegisterFeedSharedProfilePrefs(registry);
feed::RegisterProfilePrefs(registry);
