Index: chrome/browser/about_flags.cc |
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
index 3e3e3396e8b09f739434ecd02d0d7c4d68afe268..082003fce48c2c3290170793fa389830dfe57bae 100644 |
--- a/chrome/browser/about_flags.cc |
+++ b/chrome/browser/about_flags.cc |
@@ -45,7 +45,6 @@ |
#include "components/offline_pages/offline_page_switches.h" |
#include "components/omnibox/browser/omnibox_switches.h" |
#include "components/password_manager/core/common/password_manager_features.h" |
-#include "components/password_manager/core/common/password_manager_switches.h" |
#include "components/proximity_auth/switches.h" |
#include "components/search/search_switches.h" |
#include "components/security_state/switches.h" |
@@ -354,16 +353,6 @@ const FeatureEntry::Choice kExtensionContentVerificationChoices[] = { |
switches::kExtensionContentVerificationEnforceStrict }, |
}; |
-const FeatureEntry::Choice kAutofillSyncCredentialChoices[] = { |
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, |
- { IDS_ALLOW_AUTOFILL_SYNC_CREDENTIAL, |
- password_manager::switches::kAllowAutofillSyncCredential, ""}, |
- { IDS_DISALLOW_AUTOFILL_SYNC_CREDENTIAL_FOR_REAUTH, |
- password_manager::switches::kDisallowAutofillSyncCredentialForReauth, ""}, |
- { IDS_DISALLOW_AUTOFILL_SYNC_CREDENTIAL, |
- password_manager::switches::kDisallowAutofillSyncCredential, ""}, |
-}; |
- |
const FeatureEntry::Choice kFillOnAccountSelectChoices[] = { |
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
{ IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
@@ -941,9 +930,7 @@ const FeatureEntry kFeatureEntries[] = { |
IDS_FLAGS_AFFILIATION_BASED_MATCHING_NAME, |
IDS_FLAGS_AFFILIATION_BASED_MATCHING_DESCRIPTION, |
kOsWin | kOsLinux | kOsCrOS | kOsMac | kOsAndroid, |
- ENABLE_DISABLE_VALUE_TYPE( |
- password_manager::switches::kEnableAffiliationBasedMatching, |
- password_manager::switches::kDisableAffiliationBasedMatching)}, |
+ FEATURE_VALUE_TYPE(password_manager::features::kAffiliationBasedMatching)}, |
{"wallet-service-use-sandbox", IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_NAME, |
IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_DESCRIPTION, kOsAndroid | kOsDesktop, |
ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( |
@@ -1356,18 +1343,13 @@ const FeatureEntry kFeatureEntries[] = { |
#endif |
{"enable-drop-sync-credential", IDS_FLAGS_DROP_SYNC_CREDENTIAL_NAME, |
IDS_FLAGS_DROP_SYNC_CREDENTIAL_DESCRIPTION, kOsAll, |
- ENABLE_DISABLE_VALUE_TYPE( |
- password_manager::switches::kEnableDropSyncCredential, |
- password_manager::switches::kDisableDropSyncCredential)}, |
+ FEATURE_VALUE_TYPE(password_manager::features::kDropSyncCredential)}, |
#if defined(ENABLE_EXTENSIONS) |
{"enable-extension-action-redesign", |
IDS_FLAGS_EXTENSION_ACTION_REDESIGN_NAME, |
IDS_FLAGS_EXTENSION_ACTION_REDESIGN_DESCRIPTION, kOsDesktop, |
SINGLE_VALUE_TYPE(extensions::switches::kEnableExtensionActionRedesign)}, |
#endif |
- {"autofill-sync-credential", IDS_FLAGS_AUTOFILL_SYNC_CREDENTIAL_NAME, |
- IDS_FLAGS_AUTOFILL_SYNC_CREDENTIAL_DESCRIPTION, kOsAll, |
- MULTI_VALUE_TYPE(kAutofillSyncCredentialChoices)}, |
#if !defined(OS_ANDROID) |
{"enable-message-center-always-scroll-up-upon-notification-removal", |
IDS_FLAGS_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_NAME, |
@@ -1775,15 +1757,23 @@ const FeatureEntry kFeatureEntries[] = { |
IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_DESCRIPTION, kOsAll, |
FEATURE_VALUE_TYPE(features::kWebFontsIntervention)}, |
{"enable-webfonts-intervention-trigger", |
- IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_TRIGGER_NAME, |
- IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_TRIGGER_DESCRIPTION, kOsAll, |
- SINGLE_VALUE_TYPE(switches::kEnableWebFontsInterventionTrigger)}, |
+ IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_TRIGGER_NAME, |
+ IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_TRIGGER_DESCRIPTION, kOsAll, |
+ SINGLE_VALUE_TYPE(switches::kEnableWebFontsInterventionTrigger)}, |
{"enable-grouped-history", IDS_FLAGS_ENABLE_GROUPED_HISTORY_NAME, |
IDS_FLAGS_ENABLE_GROUPED_HISTORY_DESCRIPTION, kOsDesktop, |
SINGLE_VALUE_TYPE(switches::kHistoryEnableGroupByDomain)}, |
{"enable-token-binding", IDS_FLAGS_ENABLE_TOKEN_BINDING_NAME, |
IDS_FLAGS_ENABLE_TOKEN_BINDING_DESCRIPTION, kOsAll, |
FEATURE_VALUE_TYPE(features::kTokenBinding)}, |
+ {"enable-protect-sync-credential", IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_NAME, |
+ IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_DESCRIPTION, kOsAll, |
+ FEATURE_VALUE_TYPE(password_manager::features::kProtectSyncCredential)}, |
+ {"enable-protect-sync-credential-on-reauth", |
+ IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_ON_REAUTH_NAME, |
+ IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_ON_REAUTH_DESCRIPTION, kOsAll, |
+ FEATURE_VALUE_TYPE( |
+ password_manager::features::kProtectSyncCredentialOnReauth)}, |
// NOTE: Adding new command-line switches requires adding corresponding |
// entries to enum "LoginCustomFlags" in histograms.xml. See note in |
// histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |