diff options
Diffstat (limited to 'chromium/components/password_manager/core/browser/sync/password_sync_bridge.cc')
| -rw-r--r-- | chromium/components/password_manager/core/browser/sync/password_sync_bridge.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chromium/components/password_manager/core/browser/sync/password_sync_bridge.cc b/chromium/components/password_manager/core/browser/sync/password_sync_bridge.cc index 57fdaadb6b2..98c6c2aed80 100644 --- a/chromium/components/password_manager/core/browser/sync/password_sync_bridge.cc +++ b/chromium/components/password_manager/core/browser/sync/password_sync_bridge.cc @@ -18,6 +18,7 @@ #include "base/strings/escape.h" #include "base/strings/string_number_conversions.h" #include "build/build_config.h" +#include "components/password_manager/core/browser/features/password_features.h" #include "components/password_manager/core/browser/password_form.h" #include "components/password_manager/core/browser/password_manager_metrics_util.h" #include "components/password_manager/core/browser/password_store_change.h" @@ -190,12 +191,9 @@ bool IsCredentialPhished(const sync_pb::PasswordSpecificsData& specifics) { // the local copy, to be replaced by the remote version coming from Sync during // merge. bool ShouldRecoverPasswordsDuringMerge() { - // Delete the local undecryptable copy when this is MacOS or Linux only. -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - return true; -#else - return false; -#endif + // Delete the local undecryptable copy. Launched on MacOS or Linux only. + return base::FeatureList::IsEnabled( + features::kClearUndecryptablePasswordsOnSync); } bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() { |