[AppCreep] Share pref registration in prod and test code
Removes duplicated pref registration in production code and test code.
Fixed: 414768321
Change-Id: I1c5c426520dd613603cd028165866d9f712d9209
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6513288
Reviewed-by: Hidehiko Abe <[email protected]>
Commit-Queue: Aida Zolić <[email protected]>
Reviewed-by: Sergey Poromov <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1456767}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 93d3420d..8a39797e 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -428,7 +428,6 @@
#include "chrome/browser/memory/oom_kills_monitor.h"
#include "chrome/browser/metrics/chromeos_metrics_provider.h"
#include "chrome/browser/policy/annotations/blocklist_handler.h"
-#include "chrome/browser/policy/system_features_disable_list_policy_handler.h"
#include "chrome/browser/ui/ash/shelf/chrome_shelf_prefs.h"
#include "chrome/browser/ui/webui/ash/login/enable_debugging_screen_handler.h"
#include "chrome/browser/ui/webui/ash/settings/os_settings_ui.h"
@@ -447,6 +446,7 @@
#include "chromeos/ash/components/network/network_metadata_store.h"
#include "chromeos/ash/components/network/proxy/proxy_config_handler.h"
#include "chromeos/ash/components/policy/restriction_schedule/device_restriction_schedule_controller.h"
+#include "chromeos/ash/components/policy/system_features_disable_list/system_features_disable_list_policy_utils.h"
#include "chromeos/ash/components/quickoffice/quickoffice_prefs.h"
#include "chromeos/ash/components/report/report_controller.h"
#include "chromeos/ash/components/scheduler_config/scheduler_configuration_manager.h"
@@ -1769,7 +1769,7 @@
RegisterNearbySharingLocalPrefs(registry);
chromeos::echo_offer::RegisterPrefs(registry);
memory::OOMKillsMonitor::RegisterPrefs(registry);
- policy::SystemFeaturesDisableListPolicyHandler::RegisterPrefs(registry);
+ policy::RegisterDisabledSystemFeaturesPrefs(registry);
policy::DlpRulesManagerImpl::RegisterPrefs(registry);
#endif // BUILDFLAG(IS_CHROMEOS)
