www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20

--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig	2022-08-31 12:19:35 UTC
+++ components/password_manager/core/browser/sync/password_sync_bridge.cc
@@ -162,7 +162,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
   // Delete the local undecryptable copy when this is MacOS only.
 #if BUILDFLAG(IS_MAC)
   return true;
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
   return base::FeatureList::IsEnabled(
       features::kSyncUndecryptablePasswordsLinux);
 #else
@@ -171,7 +171,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
 }
 
 bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
   return ShouldRecoverPasswordsDuringMerge() &&
          base::FeatureList::IsEnabled(
              features::kForceInitialSyncWhenDecryptionFails);