Looks like the directory-based AutofillWalletDataTypeController only checks IsPaymentsIntegrationEnabled() [1], which reads the kAutofillWalletImportEnabled, whereas the USS-based AutofillWalletModelTypeController checks both kAutofillWalletImportEnabled and kAutofillCreditCardEnabled [2].

Jan, did disabling metadata when the cards autofill toggle was disabled work before?

[1]: https://cs.chromium.org/chromium/src/components/autofill/core/browser/autofill_wallet_data_type_controller.cc?rcl=3c1a127c6aba4fdac6645ca7754c1251bacce941&l=123

[2]: https://cs.chromium.org/chromium/src/components/autofill/core/browser/autofill_wallet_model_type_controller.cc?rcl=3c1a127c6aba4fdac6645ca7754c1251bacce941&l=65

Correct, this is an omission. I have a CL in flight.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/45399d3227c76eec24f57e98c2dfcdeb8378f12a

commit 45399d3227c76eec24f57e98c2dfcdeb8378f12a
Author: Jan Krcal <jkrcal@chromium.org>
Date: Wed Oct 24 07:45:29 2018

[AF] Make wallet controllers for USS/Directory consistent

This CL makes the old Directory controller react to the toggle in
Payments methods as well.

Bug:  898141 
Change-Id: I09918c9aace663376f7beb0ed0cd5f2ef3854b0e
Reviewed-on: https://chromium-review.googlesource.com/c/1296598
Commit-Queue: Jan Krcal <jkrcal@chromium.org>
Reviewed-by: Florian Uunk <feuunk@chromium.org>
Reviewed-by: Sebastien Seguin-Gagnon <sebsg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#602272}
[modify] https://crrev.com/45399d3227c76eec24f57e98c2dfcdeb8378f12a/components/autofill/core/browser/autofill_wallet_data_type_controller.cc
[modify] https://crrev.com/45399d3227c76eec24f57e98c2dfcdeb8378f12a/components/autofill/core/browser/autofill_wallet_data_type_controller_unittest.cc

Requesting a merge of #4 to fix the issue.

I won't do the actual merge until I've checked that this is fine on Canary.

Thanks!

Increasing prio as this is a safe change and it rules out a scenario that is not well tested.

Your change meets the bar and is auto-approved for M71. Please go ahead and merge the CL to branch 3578 manually. Please contact milestone owner if you have questions.
Owners: benmason@(Android), kariahda@(iOS), kbleicher@(ChromeOS), govind@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

Pls merge your change to M71 branch ASAP so we can pick it up for next beta release. Thank you.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/f3ab510a8b63b9784cd14e71c92ba5ff31a9a1a4

commit f3ab510a8b63b9784cd14e71c92ba5ff31a9a1a4
Author: Jan Krcal <jkrcal@chromium.org>
Date: Thu Oct 25 13:34:26 2018

[AF] Make wallet controllers for USS/Directory consistent

This CL makes the old Directory controller react to the toggle in
Payments methods as well.

Bug:  898141 
Change-Id: I09918c9aace663376f7beb0ed0cd5f2ef3854b0e
Reviewed-on: https://chromium-review.googlesource.com/c/1296598
Commit-Queue: Jan Krcal <jkrcal@chromium.org>
Reviewed-by: Florian Uunk <feuunk@chromium.org>
Reviewed-by: Sebastien Seguin-Gagnon <sebsg@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#602272}(cherry picked from commit 45399d3227c76eec24f57e98c2dfcdeb8378f12a)
Reviewed-on: https://chromium-review.googlesource.com/c/1299158
Cr-Commit-Position: refs/branch-heads/3578@{#317}
Cr-Branched-From: 4226ddf99103e493d7afb23a4c7902ee496108b6-refs/heads/master@{#599034}
[modify] https://crrev.com/f3ab510a8b63b9784cd14e71c92ba5ff31a9a1a4/components/autofill/core/browser/autofill_wallet_data_type_controller.cc
[modify] https://crrev.com/f3ab510a8b63b9784cd14e71c92ba5ff31a9a1a4/components/autofill/core/browser/autofill_wallet_data_type_controller_unittest.cc

Thanks, this is now merged.

The following revision refers to this bug: 
https://chromium.googlesource.com/chromium/src.git/+/f3ab510a8b63b9784cd14e71c92ba5ff31a9a1a4

Commit: f3ab510a8b63b9784cd14e71c92ba5ff31a9a1a4
Author: jkrcal@chromium.org
Commiter: feuunk@chromium.org
Date: 2018-10-25 13:34:26 +0000 UTC

[AF] Make wallet controllers for USS/Directory consistent

This CL makes the old Directory controller react to the toggle in
Payments methods as well.

Bug:  898141 
Change-Id: I09918c9aace663376f7beb0ed0cd5f2ef3854b0e
Reviewed-on: https://chromium-review.googlesource.com/c/1296598
Commit-Queue: Jan Krcal <jkrcal@chromium.org>
Reviewed-by: Florian Uunk <feuunk@chromium.org>
Reviewed-by: Sebastien Seguin-Gagnon <sebsg@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#602272}(cherry picked from commit 45399d3227c76eec24f57e98c2dfcdeb8378f12a)
Reviewed-on: https://chromium-review.googlesource.com/c/1299158
Cr-Commit-Position: refs/branch-heads/3578@{#317}
Cr-Branched-From: 4226ddf99103e493d7afb23a4c7902ee496108b6-refs/heads/master@{#599034}