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

commit eaacef69656c818e6e9c03186c9d7d55bd187e97
Author: Findit <findit-for-me@appspot.gserviceaccount.com>
Date: Tue Oct 02 14:46:15 2018

Revert "Consistently clear server credit cards with USS"

This reverts commit 3efff7c9d8c1e53a894a9bf516615a5c7f9b256b.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 595787 as the
culprit for flakes in the build cycles as shown on:
https://findit-for-me.appspot.com/waterfall/flake/flake-culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyQwsSDEZsYWtlQ3VscHJpdCIxY2hyb21pdW0vM2VmZmY3YzlkOGMxZTUzYTg5NGE5YmY1MTY2MTVhNWM3ZjliMjU2Ygw

Sample Failed Build: https://ci.chromium.org/buildbot/tryserver.chromium.win/win10_chromium_x64_rel_ng/106570

Sample Failed Step: sync_integration_tests (with patch) on Windows-10-15063

Sample Flaky Test: USS/SingleClientWalletSyncTest.ClearOnStopSync/1

Original change's description:
> Consistently clear server credit cards with USS
> 
> AutofillWalletDataTypeController is used (pre-USS) for both AUTOFILL_WALLET_DATA
> and AUTOFILL_WALLET_METADATA. When Sync is stopped, it calls
> PersonalDataManager::ClearAllServerData. Since there are two instances of the
> controller, that happens twice (which is unnecessary but doesn't hurt). However,
> when AUTOFILL_WALLET_DATA is on USS, then the remaining ClearAllServerData call
> (for the metadata controller) still happens, which brings Sync into a bad state
> since the data is now gone, but the progress marker is still there (see bug 885211).
> 
> This CL changes AutofillWalletDataTypeController to only call ClearAllServerData
> for AUTOFILL_WALLET_DATA (i.e. it won't be called anymore if Wallet is on USS).
> Instead, AUTOFILL_WALLET_DATA gets special-cased in ModelAssociationManager to
> clear even in the STOP_SYNC case. This achieves the same "clear data on stopping
> sync, but *not* on browser shutdown", but without requiring a special side channel
> to the SyncService.
> 
> One consequence is that with AUTOFILL_WALLET_DATA on USS, the clearing now happens
> asynchronously (because it goes through the DB), which requires some test changes.
> 
> Bug:  889941 
> Change-Id: I54c36050c81fa862acfc0052f355ff1645a8b292
> Reviewed-on: https://chromium-review.googlesource.com/1251041
> Commit-Queue: Marc Treib <treib@chromium.org>
> Reviewed-by: Sebastien Seguin-Gagnon <sebsg@chromium.org>
> Reviewed-by: Jan Krcal <jkrcal@chromium.org>
> Reviewed-by: Florian Uunk <feuunk@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#595787}

Change-Id: I429e5ef10c8d5b858f36ce69cc2b41b30e318fd4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  889941 ,  891254 
Reviewed-on: https://chromium-review.googlesource.com/1255573
Cr-Commit-Position: refs/heads/master@{#595831}
[modify] https://crrev.com/eaacef69656c818e6e9c03186c9d7d55bd187e97/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc
[modify] https://crrev.com/eaacef69656c818e6e9c03186c9d7d55bd187e97/chrome/browser/sync/test/integration/two_client_polling_sync_test.cc
[modify] https://crrev.com/eaacef69656c818e6e9c03186c9d7d55bd187e97/components/autofill/core/browser/autofill_wallet_data_type_controller.cc
[modify] https://crrev.com/eaacef69656c818e6e9c03186c9d7d55bd187e97/components/sync/BUILD.gn
[modify] https://crrev.com/eaacef69656c818e6e9c03186c9d7d55bd187e97/components/sync/driver/data_type_manager_impl.cc
[modify] https://crrev.com/eaacef69656c818e6e9c03186c9d7d55bd187e97/components/sync/driver/model_association_manager.cc
[modify] https://crrev.com/eaacef69656c818e6e9c03186c9d7d55bd187e97/components/sync/driver/model_association_manager.h
[modify] https://crrev.com/eaacef69656c818e6e9c03186c9d7d55bd187e97/components/sync/driver/model_association_manager_unittest.cc
[delete] https://crrev.com/9dff9f8d79ef8dcf10a1f16549fdc75036808ff0/components/sync/engine/shutdown_reason.cc
[modify] https://crrev.com/eaacef69656c818e6e9c03186c9d7d55bd187e97/components/sync/engine/shutdown_reason.h

Looks like FindIt just landed a revert based on this: https://chromium.googlesource.com/chromium/src/+/eaacef69656c818e6e9c03186c9d7d55bd187e97

Assigning OWNER + components. Downgrading priority since it has been reverted.

Sheriff will monitor to see if flake disappears after eaacef69

Closing since the CL that introduced the test got reverted. I'll address the flakiness as part of the reland.