| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 03a8170504b43c935fb2b0b35d9634ed3506995c..0b8e1dff34fe09424858fcd99badb1c8d6b7ba75 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"
|
| @@ -355,13 +354,14 @@ const FeatureEntry::Choice kExtensionContentVerificationChoices[] = {
|
| };
|
|
|
| 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, ""},
|
| + {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
|
| + {IDS_ALLOW_AUTOFILL_SYNC_CREDENTIAL,
|
| + password_manager::features::kAllowAutofillSyncCredential.name, ""},
|
| + {IDS_DISALLOW_AUTOFILL_SYNC_CREDENTIAL_FOR_REAUTH,
|
| + password_manager::features::kDisallowAutofillSyncCredentialForReauth.name,
|
| + ""},
|
| + {IDS_DISALLOW_AUTOFILL_SYNC_CREDENTIAL,
|
| + password_manager::features::kDisallowAutofillSyncCredential.name, ""},
|
| };
|
|
|
| const FeatureEntry::Choice kFillOnAccountSelectChoices[] = {
|
| @@ -1057,8 +1057,8 @@ const FeatureEntry kFeatureEntries[] = {
|
| IDS_FLAGS_AFFILIATION_BASED_MATCHING_DESCRIPTION,
|
| kOsWin | kOsLinux | kOsCrOS | kOsMac | kOsAndroid,
|
| ENABLE_DISABLE_VALUE_TYPE(
|
| - password_manager::switches::kEnableAffiliationBasedMatching,
|
| - password_manager::switches::kDisableAffiliationBasedMatching)},
|
| + password_manager::features::kEnableAffiliationBasedMatching.name,
|
| + password_manager::features::kDisableAffiliationBasedMatching.name)},
|
| {"wallet-service-use-sandbox",
|
| IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_NAME,
|
| IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_DESCRIPTION,
|
| @@ -1611,8 +1611,8 @@ const FeatureEntry kFeatureEntries[] = {
|
| IDS_FLAGS_DROP_SYNC_CREDENTIAL_DESCRIPTION,
|
| kOsAll,
|
| ENABLE_DISABLE_VALUE_TYPE(
|
| - password_manager::switches::kEnableDropSyncCredential,
|
| - password_manager::switches::kDisableDropSyncCredential)},
|
| + password_manager::features::kEnableDropSyncCredential.name,
|
| + password_manager::features::kDisableDropSyncCredential.name)},
|
| #if defined(ENABLE_EXTENSIONS)
|
| {"enable-extension-action-redesign",
|
| IDS_FLAGS_EXTENSION_ACTION_REDESIGN_NAME,
|
|
|