Add finch flag to control wallet data for passphrase users.

Change-Id: I362b1135d28fd1dfc8686ec7f1c42d0d8540691d
Bug: 871221
Reviewed-on: https://chromium-review.googlesource.com/1196450
Commit-Queue: Florian Uunk <feuunk@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587608}

components/browser_sync/profile_sync_service.cc

@@ -1633,7 +1633,12 @@ void ProfileSyncService::ConfigureDataTypeManager(
     if (base::FeatureList::IsEnabled(
             autofill::features::kAutofillEnableAccountWalletStorage) &&
         base::FeatureList::IsEnabled(switches::kSyncUSSAutofillWalletData)) {
-      allowed_types.Put(syncer::AUTOFILL_WALLET_DATA);
+      if (!IsUsingSecondaryPassphrase() ||
+          base::FeatureList::IsEnabled(
+              switches::
+                  kSyncAllowWalletDataInTransportModeWithCustomPassphrase)) {
+        allowed_types.Put(syncer::AUTOFILL_WALLET_DATA);
+      }
     }
 
     types = Intersection(types, allowed_types);

components/sync/driver/sync_driver_switches.cc

@@ -36,6 +36,12 @@ const char kSyncShortInitialRetryOverride[] =
 // that it's what you want.
 const char kSyncShortNudgeDelayForTest[] = "sync-short-nudge-delay-for-test";
 
+// Allows custom passphrase users to receive Wallet data for secondary accounts
+// while in transport-only mode.
+const base::Feature kSyncAllowWalletDataInTransportModeWithCustomPassphrase{
+    "SyncAllowAutofillWalletDataInTransportModeWithCustomPassphrase",
+    base::FEATURE_ENABLED_BY_DEFAULT};
+
 // Enables clearing of sync data when a user enables passphrase encryption.
 const base::Feature kSyncClearDataOnPassphraseEncryption{
     "ClearSyncDataOnPassphraseEncryption", base::FEATURE_DISABLED_BY_DEFAULT};

components/sync/driver/sync_driver_switches.h

@@ -20,6 +20,8 @@ extern const char kSyncServiceURL[];
 extern const char kSyncShortInitialRetryOverride[];
 extern const char kSyncShortNudgeDelayForTest[];
 
+extern const base::Feature
+    kSyncAllowWalletDataInTransportModeWithCustomPassphrase;
 extern const base::Feature kSyncClearDataOnPassphraseEncryption;
 extern const base::Feature kSyncStandaloneTransport;
 extern const base::Feature kSyncSupportSecondaryAccount;