| Index: components/password_manager/core/common/password_manager_features.cc | 
| diff --git a/components/password_manager/core/common/password_manager_features.cc b/components/password_manager/core/common/password_manager_features.cc | 
| index eeb74426077b3b8622b6f660193a7a58ebe50bde..b7f4f2d394ccf36184898cc1a888f5168a649424 100644 | 
| --- a/components/password_manager/core/common/password_manager_features.cc | 
| +++ b/components/password_manager/core/common/password_manager_features.cc | 
| @@ -8,11 +8,54 @@ namespace password_manager { | 
|  | 
| namespace features { | 
|  | 
| +// Force the password manager to allow sync credentials to be autofilled. | 
| +const base::Feature kAllowAutofillSyncCredential = { | 
| +    "allow-autofill-sync-credential", base::FEATURE_DISABLED_BY_DEFAULT}; | 
| + | 
| +// Disable affiliation based matching, so that credentials stored for an Android | 
| +// application will not be considered matches for, and will not be filled into | 
| +// corresponding Web applications. | 
| +const base::Feature kDisableAffiliationBasedMatching = { | 
| +    "disable-affiliation-based-matching", base::FEATURE_DISABLED_BY_DEFAULT}; | 
| + | 
| +// Disable dropping the credential used to sync passwords. | 
| +const base::Feature kDisableDropSyncCredential = { | 
| +    "disable-drop-sync-credential", base::FEATURE_DISABLED_BY_DEFAULT}; | 
| + | 
| +// Disable both saving and filling for the sync signin form. | 
| +const base::Feature kDisableManagerForSyncSignin = { | 
| +    "disable-manager-for-sync-signin", base::FEATURE_DISABLED_BY_DEFAULT}; | 
| + | 
| +// Disallow autofilling of the sync credential. | 
| +const base::Feature kDisallowAutofillSyncCredential = { | 
| +    "disallow-autofill-sync-credential", base::FEATURE_DISABLED_BY_DEFAULT}; | 
| + | 
| +// Disallow autofilling of the sync credential only for transactional reauth | 
| +// pages. | 
| +const base::Feature kDisallowAutofillSyncCredentialForReauth = { | 
| +    "disallow-autofill-sync-credential-for-reauth", | 
| +    base::FEATURE_DISABLED_BY_DEFAULT}; | 
| + | 
| +// Enable affiliation based matching, so that credentials stored for an Android | 
| +// application will also be considered matches for, and be filled into | 
| +// corresponding Web applications. | 
| +const base::Feature kEnableAffiliationBasedMatching = { | 
| +    "enable-affiliation-based-matching", base::FEATURE_DISABLED_BY_DEFAULT}; | 
| + | 
| // Disables the save-password prompt. Passwords are then saved automatically, | 
| // without asking the user. | 
| const base::Feature kEnableAutomaticPasswordSaving = { | 
| "enable-automatic-password-saving", base::FEATURE_DISABLED_BY_DEFAULT}; | 
|  | 
| +// Enable dropping the credential used to sync passwords. | 
| +const base::Feature kEnableDropSyncCredential = { | 
| +    "enable-drop-sync-credential", base::FEATURE_DISABLED_BY_DEFAULT}; | 
| + | 
| +// Enable saving and filling for the sync signin form. Currently the default | 
| +// behavior. | 
| +const base::Feature kEnableManagerForSyncSignin = { | 
| +    "enable-manager-for-sync-signin", base::FEATURE_DISABLED_BY_DEFAULT}; | 
| + | 
| // Enable supporting of updating password in the password manager on a password | 
| // change form submit. | 
| const base::Feature kEnablePasswordChangeSupport = { | 
|  |