Allow disabling the encrypt everything option.

In certain cases, we don't want to allow encrypting all data
(AKA, the CUSTOM_PASSPHRASE type).

BUG=424187

Review URL: https://codereview.chromium.org/656333002

Cr-Commit-Position: refs/heads/master@{#300029}

1 files changed, 17 insertions, 2 deletions

diff --git a/sync/android/java/src/org/chromium/sync/internal_api/pub/SyncDecryptionPassphraseType.java b/sync/android/java/src/org/chromium/sync/internal_api/pub/SyncDecryptionPassphraseType.java
index 27de932..2437953 100644
--- a/sync/android/java/src/org/chromium/sync/internal_api/pub/SyncDecryptionPassphraseType.java
+++ b/sync/android/java/src/org/chromium/sync/internal_api/pub/SyncDecryptionPassphraseType.java
@@ -80,14 +80,21 @@ public enum SyncDecryptionPassphraseType implements Parcelable {
         return visibleTypes;
     }
 
-    public Set<SyncDecryptionPassphraseType> getAllowedTypes() {
+    /**
+     * Get the types that are allowed to be enabled from the current type.
+     *
+     * @param encryptEverythingAllowed Whether encrypting all data is allowed.
+     */
+    public Set<SyncDecryptionPassphraseType> getAllowedTypes(boolean encryptEverythingAllowed) {
         Set<SyncDecryptionPassphraseType> allowedTypes = new HashSet<>();
         switch (this) {
             case NONE:  // Intentional fall through.
             case IMPLICIT_PASSPHRASE:  // Intentional fall through.
             case KEYSTORE_PASSPHRASE:
                 allowedTypes.add(this);
-                allowedTypes.add(CUSTOM_PASSPHRASE);
+                if (encryptEverythingAllowed) {
+                    allowedTypes.add(CUSTOM_PASSPHRASE);
+                }
                 break;
             case FROZEN_IMPLICIT_PASSPHRASE:  // Intentional fall through.
             case CUSTOM_PASSPHRASE:  // Intentional fall through.
@@ -98,6 +105,14 @@ public enum SyncDecryptionPassphraseType implements Parcelable {
         return allowedTypes;
     }
 
+    /**
+     * TODO(maxbogue): Remove when no longer used in Clank; see http://crbug.com/424187.
+     */
+    @Deprecated
+    public Set<SyncDecryptionPassphraseType> getAllowedTypes() {
+        return getAllowedTypes(true);
+    }
+
     public int internalValue() {
         // Since the values in this enums are constant and very small, this cast is safe.
         return mNativeValue;