[profiles] Delete unused experimental code for signin interception
These features were enabled with the default parameters:
* Delete the base::Feature
* Delete the chrome flags and description
* Remove the logic to suppress the profile switch, and delete the pref
* Remove _V2 and _V3 versions of the strings and use the _V1
Bug: 1166793
Change-Id: I13da2c3658b5f91f033f6be1f5d778a45afd0d9a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3017997
Auto-Submit: David Roger <[email protected]>
Reviewed-by: Alex Ilin <[email protected]>
Commit-Queue: David Roger <[email protected]>
Cr-Commit-Position: refs/heads/master@{#900463}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 0266019..7686eabe 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -141,6 +141,7 @@
#include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
#include "components/segmentation_platform/public/segmentation_platform_service.h"
#include "components/sessions/core/session_id_generator.h"
+#include "components/signin/public/base/signin_buildflags.h"
#include "components/signin/public/identity_manager/identity_manager.h"
#include "components/site_engagement/content/site_engagement_service.h"
#include "components/subresource_filter/content/browser/ruleset_service.h"
@@ -619,14 +620,16 @@
#if defined(OS_MAC)
const char kPasswordRecovery[] = "password_manager.password_recovery";
#endif
-
-// Deprecated 07/2021.
const char kWasSignInPasswordPromoClicked[] =
"profile.was_sign_in_password_promo_clicked";
const char kNumberSignInPasswordPromoShown[] =
"profile.number_sign_in_password_promo_shown";
const char kSignInPasswordPromoRevive[] =
"profile.sign_in_password_promo_revive";
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
+constexpr char kProfileSwitchInterceptionDeclinedPref[] =
+ "signin.ProfileSwitchInterceptionDeclinedPref";
+#endif
// Register local state used only for migration (clearing or moving to a new
// key).
@@ -800,6 +803,10 @@
registry->RegisterBooleanPref(kWasSignInPasswordPromoClicked, false);
registry->RegisterIntegerPref(kNumberSignInPasswordPromoShown, 0);
registry->RegisterBooleanPref(kSignInPasswordPromoRevive, false);
+
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
+ registry->RegisterDictionaryPref(kProfileSwitchInterceptionDeclinedPref);
+#endif
}
} // namespace
@@ -1572,11 +1579,12 @@
#if defined(OS_MAC)
profile_prefs->ClearPref(kPasswordRecovery);
#endif
-
- // Added 07/2021
profile_prefs->ClearPref(kWasSignInPasswordPromoClicked);
profile_prefs->ClearPref(kNumberSignInPasswordPromoShown);
profile_prefs->ClearPref(kSignInPasswordPromoRevive);
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
+ profile_prefs->ClearPref(kProfileSwitchInterceptionDeclinedPref);
+#endif
// Please don't delete the following line. It is used by PRESUBMIT.py.
// END_MIGRATE_OBSOLETE_PROFILE_PREFS
