Extend kForceInitialSyncWhenDecryptionFails to Mac and check flag later
The feature flag should be checked only if there is an encryption
problem. Otherwise, the feature will be unnecessarily triggered.
Bug: 1361638
Change-Id: Icce6eaceb30beaf37305bec8d18a2d7c0436692f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4079114
Reviewed-by: Mohamed Amir Yosef <[email protected]>
Commit-Queue: Adem Derinel <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1079701}
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 339c81cf..f362fec5 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -6397,14 +6397,6 @@
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-#if BUILDFLAG(IS_LINUX)
-const char kForcePasswordInitialSyncWhenDecryptionFailsName[] =
- "Force initial sync to clean local undecryptable passwords during startup";
-const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[] =
- "During startup checks if there are undecryptable passwords in the local "
- "storage and requests initial sync.";
-#endif // BUILDFLAG(IS_LINUX)
-
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
@@ -6412,6 +6404,11 @@
const char kSkipUndecryptablePasswordsDescription[] =
"Makes the decryptable passwords available in the password manager when "
"there are undecryptable ones.";
+const char kForcePasswordInitialSyncWhenDecryptionFailsName[] =
+ "Force initial sync to clean local undecryptable passwords during startup";
+const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[] =
+ "During startup checks if there are undecryptable passwords in the local "
+ "storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
