Complete deprecation of kLocalDiscoveryNotificationEnabled
Deprecation was started in https://crrev.com/c/2516245 and this
completes it after the privet code has been removed. Because deprecation
was started earlier, the pref is already being cleared.
Bug: chromium:1218895
Change-Id: Ic1912ca49b94dc9f505436d9ce2d22f4315cfe6f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3011842
Commit-Queue: Sean Kau <[email protected]>
Auto-Submit: Sean Kau <[email protected]>
Reviewed-by: Lei Zhang <[email protected]>
Reviewed-by: Rebekah Potter <[email protected]>
Cr-Commit-Position: refs/heads/master@{#899635}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 78ab555..0849609 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -461,6 +461,13 @@
const char kFirstRunTrialGroup[] = "help_app_first_run.trial_group";
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
+// Deprecated 11/2020
+const char kLocalDiscoveryEnabled[] = "local_discovery.enabled";
+const char kLocalDiscoveryNotificationsEnabled[] =
+ "local_discovery.notifications_enabled";
+#endif
+
// Deprecated 6/2020
const char kStricterMixedContentTreatmentEnabled[] =
"security_state.stricter_mixed_content_treatment_enabled";
@@ -680,9 +687,8 @@
#endif
#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
- registry->RegisterBooleanPref(prefs::kLocalDiscoveryEnabled, true);
- registry->RegisterBooleanPref(prefs::kLocalDiscoveryNotificationsEnabled,
- false);
+ registry->RegisterBooleanPref(kLocalDiscoveryEnabled, true);
+ registry->RegisterBooleanPref(kLocalDiscoveryNotificationsEnabled, false);
#endif
registry->RegisterIntegerPref(kSettingsLaunchedPasswordChecks, 0);
@@ -1416,8 +1422,8 @@
// Added 11/2020.
#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
- profile_prefs->ClearPref(prefs::kLocalDiscoveryEnabled);
- profile_prefs->ClearPref(prefs::kLocalDiscoveryNotificationsEnabled);
+ profile_prefs->ClearPref(kLocalDiscoveryEnabled);
+ profile_prefs->ClearPref(kLocalDiscoveryNotificationsEnabled);
#endif
// Added 11/2020
