Reland "Disable SingleClientWalletSyncTest.SameUpdatesAreIgnored on ASan/TSan"

This reverts commit 7800a3fe.

Reason for revert: Suspected culprit (which was reverted) was not the real culprit, so the test is still flaky :(

Original change's description:
> Revert "Disable SingleClientWalletSyncTest.SameUpdatesAreIgnored on ASan/TSan"
> 
> This reverts commit 55420155.
> 
> Reason for revert: I have rolled back one suspect change.
> Enabling the test again to verify it was indeed the culprit.
> 
> Original change's description:
> > Disable SingleClientWalletSyncTest.SameUpdatesAreIgnored on ASan/TSan
> >
> > The test is disabled due to high flakiness.
> >
> > TBR: treib@chromium.org
> > Bug: 997912
> > Change-Id: Ifa5e1cc89354163622a6a6ca593498c6fe3a6028
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1771974
> > Commit-Queue: Jan Krcal <jkrcal@chromium.org>
> > Reviewed-by: Marc Treib <treib@chromium.org>
> > Reviewed-by: Jan Krcal <jkrcal@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#690763}
> 
> TBR=treib@chromium.org,jkrcal@chromium.org
> 
> # Not skipping CQ checks because original CL landed > 1 day ago.
> 
> Bug: 997912
> Change-Id: I275345a29e2917d5abe5a402fa03cac0d107703c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1774630
> Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
> Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#691582}

TBR=treib@chromium.org,jkrcal@chromium.org,mamir@chromium.org

Change-Id: I8bf6cc11e7bcd912cead0e4b4c4d2491cf41d544
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 997912
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1776262Reviewed-by: Marc Treib <treib@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#691967}

chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc

@@ -611,7 +611,14 @@ IN_PROC_BROWSER_TEST_F(SingleClientWalletSyncTest,
 
 // If the server sends the same cards and addresses again, they should not
 // change on the client. We should also not overwrite existing metadata.
-IN_PROC_BROWSER_TEST_F(SingleClientWalletSyncTest, SameUpdatesAreIgnored) {
+// Flaky on ASan/TSan only. http://crbug.com/997912
+#if defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER)
+#define MAYBE_SameUpdatesAreIgnored DISABLED_SameUpdatesAreIgnored
+#else
+#define MAYBE_SameUpdatesAreIgnored SameUpdatesAreIgnored
+#endif
+IN_PROC_BROWSER_TEST_F(SingleClientWalletSyncTest,
+                       MAYBE_SameUpdatesAreIgnored) {
   GetFakeServer()->SetWalletData(
       {CreateSyncWalletCard(/*name=*/"card-1", /*last_four=*/"0001",
                             kDefaultBillingAddressID),