Commit 2a5a48af authored by Mikel Astiz's avatar Mikel Astiz Committed by Commit Bot

Revert "Enable sync trusted vault support by default"

This reverts commit f52179a5.

Reason for revert: dependencies not ready on Android.

Original change's description:
> Enable sync trusted vault support by default
> 
> The feature is in a working state can be enabled by default.
> 
> Bug: 1000146
> Change-Id: I66ef6f65d97234f47eaa76d1daafb8d3637692ed
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2000702
> Reviewed-by: Marc Treib <treib@chromium.org>
> Commit-Queue: Mikel Astiz <mastiz@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#731898}

TBR=treib@chromium.org,mastiz@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1000146
Change-Id: I24d9ed1570db010ebca418e428bfc6d0e8536c9f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2020925Reviewed-by: default avatarMikel Astiz <mastiz@chromium.org>
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735814}
parent 1d0d9774
......@@ -713,8 +713,8 @@ const base::Feature kSoundContentSetting{"SoundContentSetting",
#if !defined(OS_ANDROID)
// Enables or disables the Javascript API to propagate sync encryption keys.
const base::Feature kSyncEncryptionKeysWebApi{"SyncEncryptionKeysWebApi",
base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kSyncEncryptionKeysWebApi{
"SyncEncryptionKeysWebApi", base::FEATURE_DISABLED_BY_DEFAULT};
#endif // !defined(OS_ANDROID)
#if defined(OS_CHROMEOS)
......
......@@ -26,7 +26,7 @@ const base::Feature kSyncUseScryptForNewCustomPassphrases{
"SyncUseScryptForNewCustomPassphrases", base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kSyncSupportTrustedVaultPassphrase{
"SyncSupportTrustedVaultPassphrase", base::FEATURE_ENABLED_BY_DEFAULT};
"SyncSupportTrustedVaultPassphrase", base::FEATURE_DISABLED_BY_DEFAULT};
// If enabled sync cycle ends by collecting contributions from all datatypes
// and having less than max_commit_batch_size() entries to commit. If disabled
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment